[Erp5-report] r7813 - /spec/mandriva/2006.0/
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Jun 16 11:08:46 CEST 2006
Author: kevin
Date: Fri Jun 16 11:08:43 2006
New Revision: 7813
URL: http://svn.erp5.org?rev=7813&view=rev
Log:
Third history iteration
Modified:
spec/mandriva/2006.0/erp5-CMFPhoto.spec
spec/mandriva/2006.0/erp5-Formulator.spec
spec/mandriva/2006.0/erp5-zope.spec
spec/mandriva/2006.0/mklivecd.spec
spec/mandriva/2006.0/zope-CMFReportTool.spec
spec/mandriva/2006.0/zope-ExtFile.spec
spec/mandriva/2006.0/zope-Localizer.spec
spec/mandriva/2006.0/zope-PluggableAuthService.spec
spec/mandriva/2006.0/zope-TimerService.spec
spec/mandriva/2006.0/zope-ZMySQLDA.spec
Modified: spec/mandriva/2006.0/erp5-CMFPhoto.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/erp5-CMFPhoto.spec?rev=7813&r1=7812&r2=7813&view=diff
==============================================================================
--- spec/mandriva/2006.0/erp5-CMFPhoto.spec (original)
+++ spec/mandriva/2006.0/erp5-CMFPhoto.spec Fri Jun 16 11:08:43 2006
@@ -1,6 +1,6 @@
%define product CMFPhoto
%define version 1.2.3
-%define release 6
+%define release 7
%define zope_home %{_prefix}/lib/zope
%define software_home %{zope_home}/lib/python
@@ -56,12 +56,15 @@
fi
%files
-%defattr(0644, root, root, 0755)
+%defattr(0644, zope, zope, 0755)
%{software_home}/Products/*
#----------------------------------------------------------------------
%changelog
+* Wed Feb 01 2006 Kevin Deldycke <kevin at nexedi.com> 1.2.3-7mdk
+- Give Ownership to zope
+
* Tue Jan 24 2006 Kevin Deldycke <kevin at nexedi.com> 1.2.3-6mdk
- Add "Conflicts:" statement
- Delete "Provides:" statement
Modified: spec/mandriva/2006.0/erp5-Formulator.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/erp5-Formulator.spec?rev=7813&r1=7812&r2=7813&view=diff
==============================================================================
--- spec/mandriva/2006.0/erp5-Formulator.spec (original)
+++ spec/mandriva/2006.0/erp5-Formulator.spec Fri Jun 16 11:08:43 2006
@@ -1,6 +1,6 @@
%define product Formulator
%define version 1.6.1
-%define release 5
+%define release 6
%define zope_home %{_prefix}/lib/zope
%define software_home %{zope_home}/lib/python
@@ -55,12 +55,15 @@
fi
%files
-%defattr(0644, root, root, 0755)
+%defattr(0644, zope, zope, 0755)
%{software_home}/Products/*
#----------------------------------------------------------------------
%changelog
+* Wed Feb 01 2006 Kevin Deldycke <kevin at nexedi.com> 1.6.1-6mdk
+- Give ownership to zope
+
* Tue Jan 24 2006 Kevin Deldycke <kevin at nexedi.com> 1.6.1-5mdk
- Add "Conflicts:" statement
- Delete "Provides:" statement
Modified: spec/mandriva/2006.0/erp5-zope.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/erp5-zope.spec?rev=7813&r1=7812&r2=7813&view=diff
==============================================================================
--- spec/mandriva/2006.0/erp5-zope.spec (original)
+++ spec/mandriva/2006.0/erp5-zope.spec Fri Jun 16 11:08:43 2006
@@ -1,8 +1,8 @@
%define realVersion 2.7.8-final
-%define name zope
-%define release 3
-
-%define version %(echo %{realVersion} | sed -e's/-/./g')
+%define name zope
+%define release 4
+
+%define version %(echo %{realVersion} | sed -e's/-/./g')
%define sVersion %(echo %{realVersion} | cut -d- -f1)
@@ -19,25 +19,24 @@
Source3: README.install.urpmi.zope
Patch0: Zope-2.7.2-rc1-aq_dynamic.patch.bz2
Requires: python >= 2.3.3
-BuildRequires: python-devel >= 2.3.3
+BuildRequires: libpython-devel >= 2.3.3
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
Epoch: 1
-
-#Conflicts: zope
+Conflicts: python-zope-interface
Provides: zope = %{?Epoch:%Epoch-}%{version}
-%define python /usr/bin/python
-%define zopehome /usr/lib/zope
-%define softwarehome %{zopehome}/lib/python
-%define instancehome /var/lib/zope
-%define clienthome %{instancehome}/data
-%define statehome /var/run/zope
-%define loghome /var/log/zope
-%define configfile /etc/zope.conf
-%define zopectl /usr/bin/zopectl
-%define runzope /usr/bin/runzope
-%define zopeuser zope
+%define python /usr/bin/python
+%define zopehome /usr/lib/zope
+%define softwarehome %{zopehome}/lib/python
+%define instancehome /var/lib/zope
+%define clienthome %{instancehome}/data
+%define statehome /var/run/zope
+%define loghome /var/log/zope
+%define configfile /etc/zope.conf
+%define zopectl /usr/bin/zopectl
+%define runzope /usr/bin/runzope
+%define zopeuser zope
%description
Zope is an open source application server for building content managements,
@@ -231,6 +230,10 @@
##############################################################################
%changelog
+* Fri Apr 14 2006 Kevin Deldycke <kevin at nexedi.com> 2.7.8-4nxd
+- Add "python-zope-interface" as a conflict package
+- Required package for build is libpython-devel not python-devel
+
* Tue Jan 24 2006 Kevin Deldycke <kevin at nexedi.com> 2.7.8-3nxd
- Doc package doesn't requires zope
- Add Epoch tag
Modified: spec/mandriva/2006.0/mklivecd.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/mklivecd.spec?rev=7813&r1=7812&r2=7813&view=diff
==============================================================================
--- spec/mandriva/2006.0/mklivecd.spec (original)
+++ spec/mandriva/2006.0/mklivecd.spec Fri Jun 16 11:08:43 2006
@@ -2,7 +2,7 @@
%define name mklivecd
%define version 0.5.9
-%define release %mkrel 0.12
+%define release %mkrel 0.13
%define Summary Builds a LiveCD from an existing Mandriva Linux installation
@@ -16,7 +16,13 @@
Source0: %{name}-%{version}.tar.bz2
Patch1: mklivecd-0.5.9-hw.patch.bz2
Patch2: mklivecd-0.5.9-service.patch.bz2
-Patch3: mklivecd-0.5.9-ln_s.patch.bz2
+Patch3: mklivecd-0.5.9-no-more-hotplug.patch.bz2
+Patch4: mklivecd-0.5.9-quiet-umount.patch.bz2
+Patch5: mklivecd-0.5.9-keep-menu.patch.bz2
+Patch6: mklivecd-0.5.9-more-sata.patch.bz2
+Patch7: mklivecd-0.5.9-quiet-mode.patch.bz2
+Patch8: mklivecd-0.5.9-fix-xkb_n_xdm.patch.bz2
+Patch9: mklivecd-0.5.9-splash.patch.bz2
Requires: busybox cloop-utils mkisofs drakxtools-newt
Requires: squashfs-tools mediacheck syslinux zisofs-tools
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -29,7 +35,13 @@
%setup -q -n %{name}
%patch1 -p0 -b .hw
%patch2 -p0 -b .service
-%patch3 -p0
+%patch3 -p0 -b .hotplug
+%patch4 -p1 -b .umount
+%patch5 -p0 -b .menu
+%patch6 -p1 -b .more-sata
+%patch7 -p0 -b .quiet
+%patch8 -p0 -b .fix_xorg
+%patch9 -p1 -b .splash
%build
# use 800x600 as default resolution like DrakX (some machines dislike 1024x768)
@@ -40,7 +52,6 @@
# fix cdrom.ko lookup when building with kernel < 2.6.10-1mdk
perl -pi -e 's! drivers/cdrom/cdrom ! !' dist/mklivecd
%makeinstall_std
-rm -f $RPM_BUILD_ROOT%{_sbindir}/hwdetect
%clean
rm -rf %{buildroot}
@@ -49,9 +60,14 @@
%defattr(-,root,root)
%doc AUTHORS CHANGELOG FAQ README* TODO
%{_sbindir}/mklivecd
+%{_sbindir}/hwdetect
%{_datadir}/mklivecd/
%changelog
+* Mon Feb 06 2006 Christophe DUMEZ <christophe at nexedi.com> 0.5.9-0.13mdk
+- applying the patchs again
+- ship with hwdetect again to get usb mice to work
+
* Mon Feb 06 2006 Christophe DUMEZ <christophe at nexedi.com> 0.5.9-0.12mdk
- remove patchs added after v0.5.9-0.9mdk (was too buggy)
- recompiled for Mandriva 2006
Modified: spec/mandriva/2006.0/zope-CMFReportTool.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/zope-CMFReportTool.spec?rev=7813&r1=7812&r2=7813&view=diff
==============================================================================
--- spec/mandriva/2006.0/zope-CMFReportTool.spec (original)
+++ spec/mandriva/2006.0/zope-CMFReportTool.spec Fri Jun 16 11:08:43 2006
@@ -1,6 +1,6 @@
%define product CMFReportTool
%define version 0.1.1.20060105
-%define release 2
+%define release 3
%define zope_minver 2.6
@@ -63,12 +63,15 @@
fi
%files
-%defattr(0644, root, root, 0755)
+%defattr(0644, zope, zope, 0755)
%{software_home}/Products/*
#----------------------------------------------------------------------
%changelog
+* Wed Feb 01 2006 Kevin Deldycke <kevin at nexedi.com> 0.1.1.20060105-3mdk
+- Give ownership to zope
+
* Wed Jan 6 2006 Kevin Deldycke <kevin at nexedi.com> 0.1.1.20060105-2mdk
- Fix dependency to python-pyxml
Modified: spec/mandriva/2006.0/zope-ExtFile.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/zope-ExtFile.spec?rev=7813&r1=7812&r2=7813&view=diff
==============================================================================
--- spec/mandriva/2006.0/zope-ExtFile.spec (original)
+++ spec/mandriva/2006.0/zope-ExtFile.spec Fri Jun 16 11:08:43 2006
@@ -1,6 +1,6 @@
%define product ExtFile
%define version 1.4.4
-%define release 2
+%define release 3
%define zope_home %{_prefix}/lib/zope
%define software_home %{zope_home}/lib/python
@@ -16,6 +16,8 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-rootdir
BuildArch: noarch
Requires: zope python-imaging
+Conflicts: ExtFile
+
#----------------------------------------------------------------------
%description
@@ -52,6 +54,9 @@
#----------------------------------------------------------------------
%changelog
+* Thu Mar 09 2006 Kevin Deldycke <kevin at nexedi.com> 1.4.4-3mdk
+- Add a conflict statement with ExtFile
+
* Wed Feb 01 2006 Kevin Deldycke <kevin at nexedi.com> 1.4.4-2mdk
- Give ownership to zope
Modified: spec/mandriva/2006.0/zope-Localizer.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/zope-Localizer.spec?rev=7813&r1=7812&r2=7813&view=diff
==============================================================================
--- spec/mandriva/2006.0/zope-Localizer.spec (original)
+++ spec/mandriva/2006.0/zope-Localizer.spec Fri Jun 16 11:08:43 2006
@@ -1,6 +1,6 @@
%define product Localizer
%define version 1.1.0
-%define release 5
+%define release 6
%define zope_minver 2.7
@@ -59,11 +59,14 @@
fi
%files
-%defattr(0644, root, root, 0755)
+%defattr(0644, zope, zope, 0755)
%{software_home}/Products/*
#----------------------------------------------------------------------
%changelog
+* Wed Feb 01 2006 Kevin Deldycke <kevin at nexedi.com> 1.1.0-6mdk
+- Give ownership to zope
+
* Wed Jan 25 2006 Kevin Deldycke <kevin at nexedi.com> 1.1.0-5mdk
- Add "Conflicts" statement to disallow the user to install the Localizer package available in Mandriva 2006 repository.
- Delete Translation Service patch
Modified: spec/mandriva/2006.0/zope-PluggableAuthService.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/zope-PluggableAuthService.spec?rev=7813&r1=7812&r2=7813&view=diff
==============================================================================
--- spec/mandriva/2006.0/zope-PluggableAuthService.spec (original)
+++ spec/mandriva/2006.0/zope-PluggableAuthService.spec Fri Jun 16 11:08:43 2006
@@ -1,6 +1,6 @@
%define product PluggableAuthService
%define version 1.1b2
-%define release 2
+%define release 3
%define zope_home %{_prefix}/lib/zope
%define software_home %{zope_home}/lib/python
@@ -9,7 +9,7 @@
Name: zope-%{product}
Version: %{version}
Release: %mkrel %{release}
-License: GPL
+License: ZPL
Group: System/Servers
URL: http://www.zope.org/Members/urbanape/PluggableAuthService
Source0: %{product}-%{version}.tar.bz2
@@ -57,6 +57,9 @@
#----------------------------------------------------------------------
%changelog
+* Wed Jan 18 2006 Kevin Deldycke <kevin at nexedi.com> 1.1b2-3mdk
+- Licence is ZPL not GPL
+
* Wed Jan 18 2006 Kevin Deldycke <kevin at nexedi.com> 1.1b2-2mdk
- This package require PluginRegistry Zope product to work
Modified: spec/mandriva/2006.0/zope-TimerService.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/zope-TimerService.spec?rev=7813&r1=7812&r2=7813&view=diff
==============================================================================
--- spec/mandriva/2006.0/zope-TimerService.spec (original)
+++ spec/mandriva/2006.0/zope-TimerService.spec Fri Jun 16 11:08:43 2006
@@ -1,6 +1,6 @@
%define product TimerService
%define version 0.2
-%define release 2
+%define release 3
%define zope_home %{_prefix}/lib/zope
%define software_home %{zope_home}/lib/python
@@ -19,7 +19,6 @@
BuildArch: noarch
Requires: zope
-
#----------------------------------------------------------------------
%description
TimerService provides to Zope objects the ability to subsribe
@@ -31,7 +30,7 @@
#----------------------------------------------------------------------
%prep
%setup -c
-#%patch1 -p1
+%patch1 -p1
%build
#cd %{product}/timerserver
@@ -76,6 +75,9 @@
#----------------------------------------------------------------------
%changelog
+* Mon Jan 30 2006 Kevin Deldycke <kevin at nexedi.com> 0.2-3mdk
+- Apply Klaus' patch: it seems it make zope starting in a better way
+
* Mon Jan 23 2006 Kevin Deldycke <kevin at nexedi.com> 0.2-2mdk
- Update the description
- Set the default interval to 5 seconds
Modified: spec/mandriva/2006.0/zope-ZMySQLDA.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/zope-ZMySQLDA.spec?rev=7813&r1=7812&r2=7813&view=diff
==============================================================================
--- spec/mandriva/2006.0/zope-ZMySQLDA.spec (original)
+++ spec/mandriva/2006.0/zope-ZMySQLDA.spec Fri Jun 16 11:08:43 2006
@@ -1,6 +1,6 @@
%define product ZMySQLDA
%define version 2.0.9b2
-%define release 7
+%define release 8
%define zope_home %{_prefix}/lib/zope
%define software_home %{zope_home}/lib/python
@@ -61,12 +61,15 @@
fi
%files
-%defattr(0644, root, root, 0755)
+%defattr(0644, zope, zope, 0755)
%doc %{product}/CHANGES.txt %{product}/DEPENDENCIES.txt %{product}/README.txt %{product}/VERSION.txt
%{software_home}/Products/*
#----------------------------------------------------------------------
%changelog
+* Wed Feb 01 2006 Kevin Deldycke <kevin at nexedi.com> 2.0.9b2-8mdk
+- Give ownership to zope
+
* Tue Jan 24 2006 Kevin Deldycke <kevin at nexedi.com> 2.0.9b2-7mdk
- Delete requirement of MySQL-Max server because the MySQL server can be located on another machine
More information about the Erp5-report
mailing list