rpms
/
redhat-rpm-config
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rebase previous patches, add Fedora macros.

This commit is contained in:
Jon Masters 2007-04-03 04:07:44 +00:00
parent 9abf9abef7
commit 45933be68b
5 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
redhat-rpm-config-fedora-version-fc71.patch Normal file
View File

@ -0,0 +1,14 @@
diff -urNp redhat-rpm-config-8.0.45_orig/macros redhat-rpm-config-8.0.45/macros
--- redhat-rpm-config-8.0.45_orig/macros 2007-04-03 00:01:18.000000000 -0400
+++ redhat-rpm-config-8.0.45/macros 2007-04-03 00:03:44.000000000 -0400
@@ -8,6 +8,10 @@
%_gnu -gnu
%_target_platform %{_target_cpu}-%{_vendor}-%{_target_os}%{?_gnu}
+%fedora 7
+%dist .fc7
+%fc7 1
+
#==============================================================================
# ---- configure macros. note that most of these are inherited
# from the defaults.

16
redhat-rpm-config-find-requires.patch
View File

@ -1,6 +1,6 @@
diff -urN redhat-rpm-config-8.0.45_orig/find-requires redhat-rpm-config-8.0.45/find-requires
--- redhat-rpm-config-8.0.45_orig/find-requires 2006-07-30 19:58:01.000000000 +0100
+++ redhat-rpm-config-8.0.45/find-requires 2006-10-12 04:55:41.000000000 +0100
diff -urNp redhat-rpm-config-8.0.45_orig/find-requires redhat-rpm-config-8.0.45/find-requires
--- redhat-rpm-config-8.0.45_orig/find-requires 2006-07-30 14:58:01.000000000 -0400
+++ redhat-rpm-config-8.0.45/find-requires 2007-04-03 00:00:18.000000000 -0400
@@ -5,11 +5,6 @@
# sonames, script interpreters, and perl modules.
#
@ -13,7 +13,7 @@ diff -urN redhat-rpm-config-8.0.45_orig/find-requires redhat-rpm-config-8.0.45/f
ulimit -c 0
#
@@ -144,21 +139,18 @@
@@ -144,21 +139,18 @@ done | sort -u
# cheat a little here by looking first for a kernel, then for a kmod.
#
@ -41,10 +41,10 @@ diff -urN redhat-rpm-config-8.0.45_orig/find-requires redhat-rpm-config-8.0.45/f
[ -x /usr/lib/rpm/redhat/find-requires.ksyms ] && [ "$is_kmod" ] &&
printf "%s\n" "${filelist[@]}" | /usr/lib/rpm/redhat/find-requires.ksyms
diff -urN redhat-rpm-config-8.0.45_orig/symset-table redhat-rpm-config-8.0.45/symset-table
--- redhat-rpm-config-8.0.45_orig/symset-table 2006-06-13 03:48:59.000000000 +0100
+++ redhat-rpm-config-8.0.45/symset-table 2006-10-12 06:53:11.000000000 +0100
@@ -19,6 +19,11 @@
diff -urNp redhat-rpm-config-8.0.45_orig/symset-table redhat-rpm-config-8.0.45/symset-table
--- redhat-rpm-config-8.0.45_orig/symset-table 2006-06-12 22:48:59.000000000 -0400
+++ redhat-rpm-config-8.0.45/symset-table 2007-04-03 00:00:18.000000000 -0400
@@ -19,6 +19,11 @@ for symsets in /boot/symsets-*.tar.gz; d
| tar xf -
done

5
redhat-rpm-config-java.patch
View File

@ -1,5 +1,6 @@
--- redhat-rpm-config-8.0.45/macros.java 2006-09-05 16:24:06.000000000 -0400
+++ redhat-rpm-config-8.0.45/macros 2006-09-05 16:24:24.000000000 -0400
diff -urNp redhat-rpm-config-8.0.45_orig/macros redhat-rpm-config-8.0.45/macros
--- redhat-rpm-config-8.0.45_orig/macros 2005-08-16 20:27:33.000000000 -0400
+++ redhat-rpm-config-8.0.45/macros 2007-04-02 23:59:19.000000000 -0400
@@ -86,6 +86,7 @@
/usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} \
/usr/lib/rpm/redhat/brp-strip-comment-note %{__strip} %{__objdump} \

8
redhat-rpm-config-kmp.patch
View File

@ -1,7 +1,7 @@
diff -urN redhat-rpm-config-8.0.45_orig/macros redhat-rpm-config-8.0.45/macros
--- redhat-rpm-config-8.0.45_orig/macros 2005-08-16 20:27:33.000000000 -0400
+++ redhat-rpm-config-8.0.45/macros 2006-10-18 14:11:55.000000000 -0400
@@ -156,3 +157,67 @@
diff -urNp redhat-rpm-config-8.0.45_orig/macros redhat-rpm-config-8.0.45/macros
--- redhat-rpm-config-8.0.45_orig/macros 2007-04-03 00:00:03.000000000 -0400
+++ redhat-rpm-config-8.0.45/macros 2007-04-03 00:01:18.000000000 -0400
@@ -157,3 +157,67 @@ unset DISPLAY\
# Disable lookups
%_hkp_keyserver %{nil}

9
redhat-rpm-config.spec
View File

@ -1,7 +1,7 @@
Summary: Red Hat specific rpm configuration files.
Name: redhat-rpm-config
Version: 8.0.45
Release: 13%{dist}
Release: 14%{dist}
License: GPL
Group: Development/System
Source: redhat-rpm-config-%{version}.tar.gz
@ -10,6 +10,7 @@ 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
BuildArch: noarch
#Requires: rpmbuild(VendorConfig) <= 4.1
#Requires: mktemp
@ -35,6 +36,7 @@ chmod a+x ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat/config.{guess,sub}
(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})
install -m 755 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_prefix}/lib/rpm/redhat/
install -m 755 %{SOURCE2} ${RPM_BUILD_ROOT}/%{_prefix}/lib/rpm/redhat/
@ -46,6 +48,11 @@ rm -rf ${RPM_BUILD_ROOT}
%{_prefix}/lib/rpm/redhat
%changelog
* Tue Apr 03 2007 Jon Masters <jcm@redhat.com> 8.0.45-14
- Rebased all previous patches (since java fix introduced offset).
- Added Fedora per-release macros to platforms section of macros.
Further debate may see these move elsewhere in the ordering.
* Tue Mar 13 2007 Ben Konrath <bkonrath@redhat.com> 8.0.45-13
- Update brp-java-repack-jars to fix issue with tomcat.