[Erp5-report] r7814 - /spec/mandriva/2006.0/
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Jun 16 11:11:19 CEST 2006
Author: kevin
Date: Fri Jun 16 11:11:17 2006
New Revision: 7814
URL: http://svn.erp5.org?rev=7814&view=rev
Log:
4th history iteration
Modified:
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-Localizer.spec
spec/mandriva/2006.0/zope-PluggableAuthService.spec
spec/mandriva/2006.0/zope-TimerService.spec
spec/mandriva/2006.0/zope-ZopeTestCase.spec
Modified: spec/mandriva/2006.0/erp5-zope.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/erp5-zope.spec?rev=7814&r1=7813&r2=7814&view=diff
==============================================================================
--- spec/mandriva/2006.0/erp5-zope.spec (original)
+++ spec/mandriva/2006.0/erp5-zope.spec Fri Jun 16 11:11:17 2006
@@ -1,6 +1,6 @@
%define realVersion 2.7.8-final
%define name zope
-%define release 4
+%define release 5
%define version %(echo %{realVersion} | sed -e's/-/./g')
%define sVersion %(echo %{realVersion} | cut -d- -f1)
@@ -22,7 +22,6 @@
BuildRequires: libpython-devel >= 2.3.3
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
Epoch: 1
-Conflicts: python-zope-interface
Provides: zope = %{?Epoch:%Epoch-}%{version}
@@ -230,6 +229,9 @@
##############################################################################
%changelog
+* Fri Apr 14 2006 Kevin Deldycke <kevin at nexedi.com> 2.7.8-5nxd
+- Remove conflict with "python-zope-interface" which was too violent
+
* 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
Modified: spec/mandriva/2006.0/mklivecd.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/mklivecd.spec?rev=7814&r1=7813&r2=7814&view=diff
==============================================================================
--- spec/mandriva/2006.0/mklivecd.spec (original)
+++ spec/mandriva/2006.0/mklivecd.spec Fri Jun 16 11:11:17 2006
@@ -2,7 +2,7 @@
%define name mklivecd
%define version 0.5.9
-%define release %mkrel 0.13
+%define release %mkrel 0.14
%define Summary Builds a LiveCD from an existing Mandriva Linux installation
@@ -23,6 +23,7 @@
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
+Patch10: mklivecd-0.5.9-xres.patch.bz2
Requires: busybox cloop-utils mkisofs drakxtools-newt
Requires: squashfs-tools mediacheck syslinux zisofs-tools
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -42,6 +43,7 @@
%patch7 -p0 -b .quiet
%patch8 -p0 -b .fix_xorg
%patch9 -p1 -b .splash
+%patch10 -p0 -b .xres
%build
# use 800x600 as default resolution like DrakX (some machines dislike 1024x768)
@@ -64,6 +66,11 @@
%{_datadir}/mklivecd/
%changelog
+* 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
+- removes a module.conf option added by hwdetect that breaks the loading of the intel8x0 driver.
+
* 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
Modified: spec/mandriva/2006.0/zope-CMFReportTool.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/zope-CMFReportTool.spec?rev=7814&r1=7813&r2=7814&view=diff
==============================================================================
--- spec/mandriva/2006.0/zope-CMFReportTool.spec (original)
+++ spec/mandriva/2006.0/zope-CMFReportTool.spec Fri Jun 16 11:11:17 2006
@@ -1,6 +1,6 @@
%define product CMFReportTool
-%define version 0.1.1.20060105
-%define release 3
+%define version 0.1.1.20060206
+%define release 1
%define zope_minver 2.6
@@ -15,22 +15,10 @@
License: GPL
URL: http://www.zope.org/Members/jack-e/CMFReportTool/
Source: %{product}-%{version}.tar.bz2
-# Source: http://svn.plone.org/svn/collective/CMFReportTool/
-# -> svn co http://svn.plone.org/svn/collective/CMFReportTool/trunk/
BuildRoot: %{_tmppath}/%{name}-%{version}-rootdir
Buildarch: noarch
Requires: zope >= %{zope_minver} zope-CMF python-reportlab python-imaging python-pyxml
-
-# Same problem as the Localizer one:
-# (kevin) This "Provides:" statement don't resolve the conflit of pre-existing
-# Localizer package in Mandriva 2006 repository. When you type "urpmi Localizer",
-# nothing is prompt to ask you which version of Localizer you want to install
-# (the mandriva one or the nexedi one): the mandriva version is automatically
-# selected. To obtain the Nexedi's one, you have to type "urpmi zope-Localizer".
-# The solution could be to add a "Provides: Localizer" statement in Mandriva
-# Spec file.
-Provides: CMFReportTool
-
+Conflicts: CMFReportTool
#----------------------------------------------------------------------
%description
@@ -43,7 +31,7 @@
%setup -c
%build
-#----------------------------------------------------------------------
+
%install
%{__rm} -rf %{buildroot}
%{__mkdir_p} %{buildroot}/%{software_home}/Products
@@ -66,9 +54,12 @@
%defattr(0644, zope, zope, 0755)
%{software_home}/Products/*
-
#----------------------------------------------------------------------
%changelog
+* Mon Feb 06 2006 Kevin Deldycke <kevin at nexedi.com> 0.1.1.20060206-1mdk
+- Update to latest SVN trunk
+- Add conflicts statement to prevent the installation of old CMFReportTool
+
* Wed Feb 01 2006 Kevin Deldycke <kevin at nexedi.com> 0.1.1.20060105-3mdk
- 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=7814&r1=7813&r2=7814&view=diff
==============================================================================
--- spec/mandriva/2006.0/zope-Localizer.spec (original)
+++ spec/mandriva/2006.0/zope-Localizer.spec Fri Jun 16 11:11:17 2006
@@ -1,6 +1,6 @@
%define product Localizer
%define version 1.1.0
-%define release 6
+%define release 7
%define zope_minver 2.7
@@ -16,6 +16,7 @@
Source: %{product}-%{version}.tar.bz2
Patch0: Localizer-1.1.0-compat.patch.bz2
Patch1: Localizer-1.1.0-string_import.patch.bz2
+Patch2: Localizer-1.1.0-lang_negotiator.patch.bz2
URL: http://www.ikaaro.org/localizer/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-rootdir
BuildArch: noarch
@@ -34,6 +35,7 @@
%setup -c
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
# Not much, eh? :-)
@@ -64,6 +66,9 @@
#----------------------------------------------------------------------
%changelog
+* Tue Mar 21 2006 Yoshinori Okuji <yo at nexedi.com> 1.1.0-7mdk
+- Patch lang_negotiator so that it returns None when context is not available
+
* Wed Feb 01 2006 Kevin Deldycke <kevin at nexedi.com> 1.1.0-6mdk
- Give ownership to zope
Modified: spec/mandriva/2006.0/zope-PluggableAuthService.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/zope-PluggableAuthService.spec?rev=7814&r1=7813&r2=7814&view=diff
==============================================================================
--- spec/mandriva/2006.0/zope-PluggableAuthService.spec (original)
+++ spec/mandriva/2006.0/zope-PluggableAuthService.spec Fri Jun 16 11:11:17 2006
@@ -1,6 +1,6 @@
%define product PluggableAuthService
%define version 1.1b2
-%define release 3
+%define release 4
%define zope_home %{_prefix}/lib/zope
%define software_home %{zope_home}/lib/python
@@ -52,11 +52,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.1b2-4mdk
+- Give ownership to zope
+
* Wed Jan 18 2006 Kevin Deldycke <kevin at nexedi.com> 1.1b2-3mdk
- Licence is ZPL not GPL
Modified: spec/mandriva/2006.0/zope-TimerService.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/zope-TimerService.spec?rev=7814&r1=7813&r2=7814&view=diff
==============================================================================
--- spec/mandriva/2006.0/zope-TimerService.spec (original)
+++ spec/mandriva/2006.0/zope-TimerService.spec Fri Jun 16 11:11:17 2006
@@ -1,6 +1,6 @@
%define product TimerService
%define version 0.2
-%define release 3
+%define release 4
%define zope_home %{_prefix}/lib/zope
%define software_home %{zope_home}/lib/python
@@ -68,13 +68,16 @@
fi
%files
-%defattr(0644, root, root, 0755)
+%defattr(0644, zope, zope, 0755)
%doc %{product}/INSTALL.txt %{product}/CREDITS.txt %{product}/version.txt
%{python_home}/timerserver
%{software_home}/Products/*
#----------------------------------------------------------------------
%changelog
+* Wed Feb 01 2006 Kevin Deldycke <kevin at nexedi.com> 0.2-4mdk
+- Give ownership to zope
+
* 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
Modified: spec/mandriva/2006.0/zope-ZopeTestCase.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/zope-ZopeTestCase.spec?rev=7814&r1=7813&r2=7814&view=diff
==============================================================================
--- spec/mandriva/2006.0/zope-ZopeTestCase.spec (original)
+++ spec/mandriva/2006.0/zope-ZopeTestCase.spec Fri Jun 16 11:11:17 2006
@@ -1,6 +1,6 @@
%define product ZopeTestCase
-%define version 0.9.0
-%define release 3
+%define version 0.9.8
+%define release 1
%define zope_home %{_prefix}/lib/zope
%define software_home %{zope_home}/lib/python
@@ -35,8 +35,8 @@
%install
%{__rm} -rf %{buildroot}
-%{__mkdir_p} %{buildroot}/%{software_home}/Products
-%{__cp} -a * %{buildroot}%{software_home}/Products/
+%{__mkdir_p} %{buildroot}/%{software_home}/Testing
+%{__cp} -a * %{buildroot}%{software_home}/Testing/
%clean
@@ -53,11 +53,17 @@
fi
%files
-%defattr(0644, root, root, 0755)
-%{software_home}/Products/*
+%defattr(0644, zope, zope, 0755)
+%{software_home}/Testing/*
#----------------------------------------------------------------------
%changelog
+* Fri Feb 03 2006 Kevin Deldycke <kevin at nexedi.com> 0.9.8-1mdk
+- Update to a newer version
+
+* Wed Feb 01 2006 Kevin Deldycke <kevin at nexedi.com> 0.9.0-4mdk
+- Give ownership to zope
+
* Tue Jan 31 2006 Kevin Deldycke <kevin at nexedi.com> 0.9.0-3mdk
- Update description
@@ -65,4 +71,4 @@
- Update spec file to follow new mandrake .spec file rules
* Wed Aug 18 2004 Sebastien Robin <seb at nexedi.com> 0.9.0-1mdk
-- Create the spec file
+- Create the spec file
More information about the Erp5-report
mailing list