devel/redhat-rpm-config .cvsignore, 1.24, 1.25 redhat-rpm-config.spec, 1.49, 1.50 sources, 1.24, 1.25 brp-java-repack-jars, 1.5, NONE kmodtool, 1.3, NONE redhat-rpm-config-fedora-version-fc71.patch, 1.2, NONE redhat-rpm-config-find-provides.patch, 1.1, NONE redhat-rpm-config-find-requires.patch, 1.3, NONE redhat-rpm-config-java.patch, 1.3, NONE redhat-rpm-config-kmp.patch, 1.5, NONE

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/pkgs/devel/redhat-rpm-config
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12194

Modified Files:
	.cvsignore redhat-rpm-config.spec sources 
Removed Files:
	brp-java-repack-jars kmodtool 
	redhat-rpm-config-fedora-version-fc71.patch 
	redhat-rpm-config-find-provides.patch 
	redhat-rpm-config-find-requires.patch 
	redhat-rpm-config-java.patch redhat-rpm-config-kmp.patch 
Log Message:
* Tue Jun 19 2007 Jeremy Katz <katzj at redhat.com> - 8.1.0-1.fc8
- integrate patches into upstream CVS.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/redhat-rpm-config/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	30 Jul 2006 18:59:10 -0000	1.24
+++ .cvsignore	19 Jun 2007 16:00:30 -0000	1.25
@@ -1 +1 @@
-redhat-rpm-config-8.0.45.tar.gz
+redhat-rpm-config-8.1.0.tar.gz


Index: redhat-rpm-config.spec
===================================================================
RCS file: /cvs/pkgs/devel/redhat-rpm-config/redhat-rpm-config.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- redhat-rpm-config.spec	18 May 2007 16:27:30 -0000	1.49
+++ redhat-rpm-config.spec	19 Jun 2007 16:00:30 -0000	1.50
@@ -1,17 +1,10 @@
 Summary: Red Hat specific rpm configuration files.
 Name: redhat-rpm-config
-Version: 8.0.45
-Release: 16.fc8
+Version: 8.1.0
+Release: 1.fc8
 License: GPL
 Group: Development/System
 Source: redhat-rpm-config-%{version}.tar.gz
-Source1: brp-java-repack-jars
-Source2: kmodtool
-Patch0: redhat-rpm-config-java.patch
-Patch1: redhat-rpm-config-find-requires.patch
-Patch2: redhat-rpm-config-kmp.patch
-Patch3: redhat-rpm-config-fedora-version-fc71.patch
-Patch4: redhat-rpm-config-find-provides.patch
 BuildArch: noarch
 #Requires: rpmbuild(VendorConfig) <= 4.1
 #Requires: mktemp
@@ -33,15 +26,16 @@
 
 # fix perms of config.{guess,sub}
 chmod a+x ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat/config.{guess,sub}
+chmod a+x ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat/brp*
 
-(cd ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat ; patch -p1 -i %{PATCH0})
-(cd ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat ; patch -p1 -i %{PATCH1})
-(cd ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat ; patch -p1 -i %{PATCH2})
-(cd ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat ; patch -p1 -i %{PATCH3})
-(cd ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat ; patch -p1 -i %{PATCH4})
-install -m 755 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_prefix}/lib/rpm/redhat/
-install -m 755 %{SOURCE2} ${RPM_BUILD_ROOT}/%{_prefix}/lib/rpm/redhat/
-chmod a+x ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat/find-*.d/*.prov
+cat >> ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat/macros << EOF
+
+#
+# dist macros
+%%fedora   8
+%%dist     .fc8
+%%fc8      1
+EOF
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -51,6 +45,9 @@
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Tue Jun 19 2007 Jeremy Katz <katzj at redhat.com> - 8.1.0-1.fc8
+- integrate patches into upstream CVS.
+
 * Fri May 18 2007 Jesse Keating <jkeating at redhat.com> 8.0.45-16
 - Update macros for F8
 - hardcode dist in release string, as we provide it.  chicken/egg.


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/redhat-rpm-config/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	30 Jul 2006 18:59:10 -0000	1.24
+++ sources	19 Jun 2007 16:00:30 -0000	1.25
@@ -1 +1 @@
-0e8ca54ca16ed9bb0af8825f2f5bad26  redhat-rpm-config-8.0.45.tar.gz
+64437c8c3877968040692bc8ef93289f  redhat-rpm-config-8.1.0.tar.gz


--- brp-java-repack-jars DELETED ---


--- kmodtool DELETED ---


--- redhat-rpm-config-fedora-version-fc71.patch DELETED ---


--- redhat-rpm-config-find-provides.patch DELETED ---


--- redhat-rpm-config-find-requires.patch DELETED ---


--- redhat-rpm-config-java.patch DELETED ---


--- redhat-rpm-config-kmp.patch DELETED ---