rpms/rpm/devel .cvsignore, 1.14, 1.15 rpm.spec, 1.172, 1.173 sources, 1.119, 1.120 popt_zh_CN.po, 1.1, NONE popt_zh_TW.po, 1.1, NONE rpm-4.4.1-check-symlinks.patch, 1.1, NONE rpm-4.4.1-gcc4.patch, 1.1, NONE rpm-4.4.1-matchpathcon.patch, 1.7, NONE rpm-4.4.1-posttrans.patch, 1.1, NONE rpm-4.4.1-read-macro.patch, 1.1, NONE rpm-4.4.x-signature.patch, 1.1, NONE

[fedora-cvs-commits redhat com]

Author: pnasrat

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12168

Modified Files:
	.cvsignore rpm.spec sources 
Removed Files:
	popt_zh_CN.po popt_zh_TW.po rpm-4.4.1-check-symlinks.patch 
	rpm-4.4.1-gcc4.patch rpm-4.4.1-matchpathcon.patch 
	rpm-4.4.1-posttrans.patch rpm-4.4.1-read-macro.patch 
	rpm-4.4.x-signature.patch 
Log Message:
New version


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	6 Feb 2005 18:51:55 -0000	1.14
+++ .cvsignore	21 Jul 2005 21:26:50 -0000	1.15
@@ -1,2 +1,3 @@
 rpm-4.3.3.tar.gz
 rpm-4.4.1.tar.gz
+rpm-4.4.2.tar.gz


Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- rpm.spec	2 Jun 2005 14:07:52 -0000	1.172
+++ rpm.spec	21 Jul 2005 21:26:50 -0000	1.173
@@ -17,25 +17,19 @@
 
 Summary: The RPM package management system.
 Name: rpm
-%define version 4.4.1
+%define version 4.4.2
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 21
+Release: 1
 Group: System Environment/Base
-Source: ftp://jbj.org/pub/rpm-devel/rpm-%{rpm_version}.tar.gz
-Source1: popt_zh_TW.po
-Source2: popt_zh_CN.po
-Patch0: rpm-4.4.1-posttrans.patch
-Patch1: rpm-4.4.1-gcc4.patch
-Patch2: rpm-4.4.1-hkp-disable.patch
-Patch3: rpm-4.4.1-read-macro.patch
-Patch4: rpm-4.4.1-fileconflicts.patch 
-Patch5: rpm-4.4.1-prereq.patch
-Patch6: rpm-4.4.1-nonmerged.patch
-Patch7: rpm-4.4.1-prepostun.patch
-Patch8: rpm-4.4.1-ordererase.patch
-Patch9: rpm-4.4.1-matchpathcon.patch
-Patch10: rpm-4.4.1-check-symlinks.patch
+Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz
+Patch0: rpm-4.4.1-hkp-disable.patch
+Patch1: rpm-4.4.1-fileconflicts.patch 
+Patch2: rpm-4.4.1-prereq.patch
+Patch3: rpm-4.4.1-nonmerged.patch
+Patch4: rpm-4.4.1-prepostun.patch
+Patch5: rpm-4.4.1-ordererase.patch
+Patch6: rpm-4.4.2-matchpathcon.patch
 License: GPL
 Conflicts: patch < 2.5
 %ifos linux
@@ -145,24 +139,14 @@
 
 %prep
 %setup -q
-%patch0 -p0 
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1 
-%patch4 -p1  -b .fileconflicts
-%patch5 -p1  -b .prereq
-%patch6 -p1
-%patch7 -p1  -b .prepostun
-%patch8 -p1  -b .ordererase
-%patch9 -p1  -b .matchpathcon
-%patch10 -p1  -b .checklinks
-
-# XXX move zh_CN
-sed -i 's/zh_CN.GB2312/zh_CN zh_TW/' popt/configure*
-mv -f po/zh_CN.GB2312.po po/zh_CN.po
-rm -f popt/po/zh_CN.GB2312.po popt/po/zh_CN.GB2312.gmo
-cp %{SOURCE1} popt/po/zh_CN.po 
-cp %{SOURCE2} popt/po/zh_TW.po 
+%patch0 -p1  -b .nohkp
+%patch1 -p1  -b .fileconflicts
+%patch2 -p1  -b .prereq
+%patch3 -p1  -b .rpmal
+%patch4 -p1  -b .prepostun
+%patch5 -p1  -b .ordererase
+%patch6 -p1  -b .matchpathcon
+
 
 %build
 
@@ -491,9 +475,7 @@
 %if %{with_python_subpackage}
 %files python
 %defattr(-,root,root)
-%{__libdir}/python%{with_python_version}/site-packages/poptmodule*
 %{__libdir}/python%{with_python_version}/site-packages/rpm
-%{__libdir}/python%{with_python_version}/site-packages/rpmdb
 %endif
 
 %files devel
@@ -561,6 +543,9 @@
 %{__includedir}/popt.h
 
 %changelog
+* Thu Jul 21 2005 Paul Nasrat <pnasrat redhat com> - 4.4.2-1
+- Upgrade to upstream release
+
 * Tue May 24 2005 Paul Nasrat <pnasrat redhat com> - 4.4.1-21
 - Update translations (#154623)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/sources,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- sources	14 Feb 2005 00:31:20 -0000	1.119
+++ sources	21 Jul 2005 21:26:50 -0000	1.120
@@ -1 +1 @@
-90ded9047b1b69d918c6c7c7b56fd7a9  rpm-4.4.1.tar.gz
+e24ce468082479fe850c9d6563f56db5  rpm-4.4.2.tar.gz


--- popt_zh_CN.po DELETED ---


--- popt_zh_TW.po DELETED ---


--- rpm-4.4.1-check-symlinks.patch DELETED ---


--- rpm-4.4.1-gcc4.patch DELETED ---


--- rpm-4.4.1-matchpathcon.patch DELETED ---


--- rpm-4.4.1-posttrans.patch DELETED ---


--- rpm-4.4.1-read-macro.patch DELETED ---


--- rpm-4.4.x-signature.patch DELETED ---