[Erp5-report] r7815 - /spec/mandriva/2006.0/

[nobody at svn.erp5.org]

Author: kevin
Date: Fri Jun 16 11:15:58 2006
New Revision: 7815

URL: http://svn.erp5.org?rev=7815&view=rev
Log:
5th history commit

Modified:
    spec/mandriva/2006.0/mklivecd.spec
    spec/mandriva/2006.0/zope-PluggableAuthService.spec
    spec/mandriva/2006.0/zope-TimerService.spec

Modified: spec/mandriva/2006.0/mklivecd.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/mklivecd.spec?rev=7815&r1=7814&r2=7815&view=diff
==============================================================================
--- spec/mandriva/2006.0/mklivecd.spec (original)
+++ spec/mandriva/2006.0/mklivecd.spec Fri Jun 16 11:15:58 2006
@@ -2,7 +2,7 @@
 
 %define name	mklivecd
 %define version	0.5.9
-%define release	%mkrel 0.14
+%define release	%mkrel 0.15
 
 %define Summary	Builds a LiveCD from an existing Mandriva Linux installation
 
@@ -43,16 +43,15 @@
 %patch7 -p0 -b .quiet
 %patch8 -p0 -b .fix_xorg
 %patch9 -p1 -b .splash
-%patch10 -p0 -b .xres
+%patch10 -p1 -b .xres
 
 %build
-# use 800x600 as default resolution like DrakX (some machines dislike 1024x768)
-%make DEF_RESOLUTION=800x600 DEF_VGAMODE=788
+
+%make
 
 %install
 rm -rf %{buildroot}
-# fix cdrom.ko lookup when building with kernel < 2.6.10-1mdk
-perl -pi -e 's! drivers/cdrom/cdrom ! !' dist/mklivecd
+
 %makeinstall_std
 
 %clean
@@ -66,6 +65,11 @@
 %{_datadir}/mklivecd/
 
 %changelog
+* Tue Feb 14 2006 Christophe DUMEZ <christophe at nexedi.com> 0.5.9-0.15mdk
+- Removed line overriding default resolution of 1024 x 764 (was still using 800x600)
+- Removed a bugfix concerning cdrom and kernel <= 2.6.10 (we are using 2.6.12)
+- Fixed a bug with bacula-dir (db was deleted by mklivecd)
+
 * Mon Feb 10 2006 Christophe DUMEZ <christophe at nexedi.com> 0.5.9-0.14mdk
 - Using a default resolution of 1024 x 764 if possible
 - save up the /etc/fstab if it exists

Modified: spec/mandriva/2006.0/zope-PluggableAuthService.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/zope-PluggableAuthService.spec?rev=7815&r1=7814&r2=7815&view=diff
==============================================================================
--- spec/mandriva/2006.0/zope-PluggableAuthService.spec (original)
+++ spec/mandriva/2006.0/zope-PluggableAuthService.spec Fri Jun 16 11:15:58 2006
@@ -1,6 +1,6 @@
 %define product PluggableAuthService
 %define version 1.1b2
-%define release 4
+%define release 5
 
 %define zope_home %{_prefix}/lib/zope
 %define software_home %{zope_home}/lib/python
@@ -13,6 +13,7 @@
 Group:     System/Servers
 URL:       http://www.zope.org/Members/urbanape/PluggableAuthService
 Source0:   %{product}-%{version}.tar.bz2
+Patch0:    PluggableAuthService-zope_interface.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-rootdir
 BuildArch: noarch
 Requires:  zope zope-PluginRegistry
@@ -34,7 +35,7 @@
 %build
 
 %install
-%{__rm} -rf %{buildroot}
+%{__rm} -rf  %{buildroot}
 %{__mkdir_p} %{buildroot}/%{software_home}/Products
 %{__cp} -a * %{buildroot}%{software_home}/Products/
 
@@ -57,6 +58,9 @@
 
 #----------------------------------------------------------------------
 %changelog
+* Fri Apr 14 2006 Kevin Deldycke <kevin at nexedi.com> 1.1b2-5mdk
+- Add a patch to not force the import of Five
+
 * Wed Feb 01 2006 Kevin Deldycke <kevin at nexedi.com> 1.1b2-4mdk
 - Give ownership to zope
 

Modified: spec/mandriva/2006.0/zope-TimerService.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/zope-TimerService.spec?rev=7815&r1=7814&r2=7815&view=diff
==============================================================================
--- spec/mandriva/2006.0/zope-TimerService.spec (original)
+++ spec/mandriva/2006.0/zope-TimerService.spec Fri Jun 16 11:15:58 2006
@@ -1,6 +1,6 @@
 %define product   TimerService
 %define version   0.2
-%define release   4
+%define release   5
 
 %define zope_home     %{_prefix}/lib/zope
 %define software_home %{zope_home}/lib/python
@@ -75,6 +75,9 @@
 
 #----------------------------------------------------------------------
 %changelog
+* Mon Mar 06 2006 Kevin Deldycke <kevin at nexedi.com> 0.2-5mdk
+- Integrate new patch (see http://dev.legco.biz/forums/products/zopescheduler/0003/ for more details)
+
 * Wed Feb 01 2006 Kevin Deldycke <kevin at nexedi.com> 0.2-4mdk
 - Give ownership to zope