Ver Fonte

updated: cyrus-imapd, python-pyxml

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@889 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki há 15 anos atrás
pai
commit
234064531f
2 ficheiros alterados com 92 adições e 9 exclusões
  1. 57 3
      c/cyrus-imapd/cyrus-imapd-vl.spec
  2. 35 6
      p/python-pyxml/python-pyxml-vl.spec

+ 57 - 3
c/cyrus-imapd/cyrus-imapd-vl.spec

@@ -1,6 +1,6 @@
 Name:			cyrus-imapd
 Version:		2.2.13p1
-Release:		1%{?_dist_release}
+Release:		5%{?_dist_release}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -49,13 +49,20 @@ Release:		1%{?_dist_release}
 # use authorization module METHOD [unix|krb5]
 %{!?AUTH_METHOD:	%define		AUTH_METHOD unix}
 
+# krb5
+%if %{?_dist_release} == "vl4" || %{?_dist_release} == "vl5"
+%define krb5 0
+%else
+%define krb5 1
+%endif
+
 # ********************** BUILD TIME OPTIONS END ************************
 
 %define		_use_internal_dependency_generator 0
 %define		_vlver %(eval rpm -q --queryformat '%{VERSION}' $(rpm -qf /etc/vine-release))
 %define		_vlrelease %(eval %{__cat} /etc/vine-release)
 %define		_dbver db4
-%define		_dbrpmver db4-4.6.21-6
+%define		_dbrpmver %(eval rpm -q db4)
 %define		_perlhack 1
 %define		_perl_man3dir %(eval "$(perl -V:man3dir)"; echo $man3dir)
 # Disable -debuginfo package generation
@@ -79,6 +86,7 @@ Source9:		http://email.uoa.gr/projects/cyrus/autosievefolder/README.autosievefol
 Source10:		cyrus-imapd-db.cfg
 Source11:		cyrus-imapd.init
 Source12:		cyrus-imapd.sysconfig
+# updated 2009-09-26 inagaki
 Source13:		cyrus-imapd.cvt_cyrusdb_all
 Source14:		cyrus-imapd.magic
 Source15:      		http://clement.hermann.free.fr/scripts/Cyrus/imapcreate.pl
@@ -107,9 +115,21 @@ Patch7:			cyrus-imapd-2.1.15-nobarenewlinescheck.patch
 Patch8:			cyrus-imapd-2.2.4-allnumeric.patch
 Patch9:			cyrus-imapd-2.2.4-OE-seenstate.patch
 Patch10:		cyrus-imapd-acceptinvalidfrom.patch
+Patch11:		cyrus-imapd-2.2.12-dontstrip.patch
+Patch12:		cyrus-imapd-2.2.12-off-by-one-null.patch
+Patch13:		cyrus-imapd-2.2.12-getgrouplist.patch
+Patch14:		cyrus-imapd-2.2.12-quota64b.patch
+Patch15:		cyrus-imapd-2.2.12-autocreate-crashfix1.diff
+#for rhbz#505425
+Patch16:                cyrus-imapd-2.2.12-encode64.patch
+#from upstream, rhbz#521056
+Patch17:		cyrus-imapd-2.3.7-bufov.patch
+
 Patch51:                cyrus-imapd-2.2.12-config.patch
 Patch52:                cyrus-imapd-2.2.12-db4.6.patch
 # Patches >= 100 are fixed in CVS
+Patch100:		cyrus-imapd-2.2.13-2817.patch
+
 BuildRoot:		%{_tmppath}/%{name}-%{version}-root
 BuildRequires:		cyrus-sasl-devel >= 2.1.15-1
 BuildRequires:		perl
@@ -118,9 +138,16 @@ BuildRequires:		%{_dbver}-devel
 BuildRequires:		openssl-devel
 BuildRequires:		flex, bison, groff >= 1.15-8
 BuildRequires:		autoconf
+%if %{krb5}
+BuildRequires:		krb5-devel
+%endif
 Requires:		cyrus-sasl >= 2.1.15
 Requires:		file >= 3.35-1
-Prereq:			e2fsprogs, diffutils, /sbin/chkconfig, /sbin/service
+Requires(pre):		coreutils shadow-utils /sbin/service
+Requires(post):		coreutils make diffutils e2fsprogs grep
+Requires(post):		db4-utils file /sbin/chkconfig
+Requires(postun):	shadow-utils /sbin/service
+Requires(preun):	/sbin/service /sbin/chkconfig
 
 %define		uid 76
 %if %{SASLGROUP}
@@ -236,9 +263,19 @@ one running the server.
 %patch9 -p1 -b .oeseenstate
 %endif
 %patch10 -p1 -b .acceptinvalidfrom
+%patch11 -p1 -b .dontstrip
+#patch12 -p1 -b .off-by-one-null
+%patch13 -p1 -b .getgrouplist
+#patch14 -p1 -b .quota64b
+%patch15 -p1 -b .autocreate-crashfix1
+%patch16 -p1 -b .encode64
+#patch17 -p1 -b .bufov
+
 %patch51 -p1 -b .config
 %patch52 -p1 -b .db46
 
+%patch100 -p0 -b .2817
+
 aclocal -I ./cmulocal
 autoconf -I ./cmulocal
 
@@ -263,6 +300,9 @@ LDFLAGS="$LDFLAGS -pie"; export LDFLAGS
 %endif
 %if %{IDLED}
   --with-idle=idled \
+%endif
+%if !%{krb5}
+  --disable-gssapi \
 %endif
   --enable-murder \
   --enable-nntp \
@@ -713,6 +753,20 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Sat Apr 24 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.2.13p1-5
+- use Requires(pre,post,postun,preun) instead of Prereq
+
+* Thu Nov  5 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.2.13p1-4
+- added --disable-gssapi for vl4, vl5
+
+* Sun Oct 11 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.2.13p1-3
+- added Patch100 from Bugzilla 
+
+* Sat Sep 26 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.2.13p1-2
+- fixed for <BTS:VineLinux:781>
+  updated Source13 to convert db correctly at cyrus-imapd upgrade
+  added PreReq: db4-utils, file
+
 * Fri Sep 18 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.2.13p1-1
 - new upstream release, including security fix for CVE-2009-2632
 - dropped Patch50 merged into upstream

+ 35 - 6
p/python-pyxml/python-pyxml-vl.spec

@@ -6,14 +6,21 @@ Summary:	XML libraries for python
 Summary(ja):	Python XML ライブラリ
 Name:		python-pyxml
 Version:	0.8.4
-Release:	4%{?_dist_release}
+Release:	5%{?_dist_release}
 URL:		http://pyxml.sourceforge.net/
 Source0:	http://prdownloads.sourceforge.net/pyxml/PyXML-%{version}.tar.gz
+Patch0: 	PyXML-0.7.1-intern.patch
+Patch1: 	PyXML-0.8.4-cvs20041111-python2.4-backport.patch
+Patch2: 	PyXML-memmove.patch
+Patch3: 	PyXML-0.8.4-python2.6.patch
+
 License:	Apacheish
-Group:		Development/Languages
-Requires:	python, libexpat
-BuildRequires:	python-devel, expat-devel
+Group:		Development/Libraries
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRequires:	python-devel, expat-devel
+BuildRequires:	python-setuptools
+Requires:	python, libexpat
 Obsoletes:	%{module}
 Provides:	%{module}
 
@@ -24,14 +31,24 @@ and an interface to the Expat parser.
 
 %prep
 %setup -q -n %{module}-%{version}
+%patch0 -p1 -b .intern
+%patch1 -p1 -b .python2.4-backport
+%patch2 -p1
+%patch3 -p1
+
+# iconv to use utf8
+for file in CREDITS ANNOUNCE doc/xml-howto.txt doc/xml-ref.txt README; do
+  iconv -f iso8859-1 -t utf-8 -o tmp $file
+  mv tmp $file
+done
 
 %build
 CFLAGS="%{optflags}" \
-	%{_bindir}/python setup.py build --with-libexpat=%{_prefix}
+	%{_bindir}/python -c 'import setuptools; execfile("setup.py")' build --with-libexpat=%{_prefix}
 
 %install
 %__rm -rf %{buildroot}
-%{_bindir}/python setup.py install --root=%{buildroot}
+%{_bindir}/python -c 'import setuptools; execfile("setup.py")' install --skip-build install --root=%{buildroot}
 
 %{_bindir}/python -O %{_libdir}/python%{pyver}/compileall.py \
 	%{buildroot}%{python_sitearch}
@@ -46,6 +63,18 @@ CFLAGS="%{optflags}" \
 %{python_sitearch}/*
 
 %changelog
+* Sat Jun 06 2009 Shu KONNO <owa@bg.wakwak.com> 0.8.4-5
+- rebuilt with python-2.6
+- added Patch0-4 from Fedora
+  * Wed Dec 24 2008 Johan Cwiklinski <johan AT x-tnd DOT be> - 0.8.4-12
+  - Patch for 'as' reserved keyword (bug #477783)
+  * Thu Jul 27 2006 Florian La Roche <laroche@redhat.com> - 0.8.4-4
+  - don't check memmove
+  * Thu Nov 11 2004 Miloslav Trmac <mitr@redhat.com> - 0.8.4-0.cvs20041111.1
+  - Backport xml.sax.saxutils fix from Python 2.4b2
+  * Fri Jun 28 2002 Trond Eivind Glomsrød <teg@redhat.com>
+  - A fix for the expatreader
+
 * Sat Jun 06 2009 Shu KONNO <owa@bg.wakwak.com> 0.8.4-4
 - spec in utf-8 properly
 - use rpm macros: pyver, python_sitearch