OBS User unknown 2009-04-02 15:18:50 +00:00 committed by Git OBS Bridge
parent aff076be86
commit f576b0beb9
4 changed files with 34 additions and 23 deletions

View File

@ -5,6 +5,8 @@ SUSE specific kernel provides/requires scripts
scripts/find-requires.ksyms | 59 ++++++++++++++++++++++++++++++++++++++++++++ scripts/find-requires.ksyms | 59 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 82 insertions(+) 2 files changed, 82 insertions(+)
Index: scripts/find-provides.ksyms
===================================================================
--- /dev/null --- /dev/null
+++ scripts/find-provides.ksyms +++ scripts/find-provides.ksyms
@@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
@ -31,9 +33,11 @@ SUSE specific kernel provides/requires scripts
+ | sed -r -ne "s/^0*([0-9a-f]+) A __crc_(.+)/ksym($flavor:\\2) = \\1/p" + | sed -r -ne "s/^0*([0-9a-f]+) A __crc_(.+)/ksym($flavor:\\2) = \\1/p"
+done \ +done \
+| sort -u +| sort -u
Index: scripts/find-requires.ksyms
===================================================================
--- /dev/null --- /dev/null
+++ scripts/find-requires.ksyms +++ scripts/find-requires.ksyms
@@ -0,0 +1,59 @@ @@ -0,0 +1,57 @@
+#! /bin/bash +#! /bin/bash
+ +
+IFS=$'\n' +IFS=$'\n'
@ -55,10 +59,8 @@ SUSE specific kernel provides/requires scripts
+all_requires() { +all_requires() {
+ for module in "$@"; do + for module in "$@"; do
+ set -- $(/sbin/modinfo -F vermagic "$module" | sed -e 's: .*::' -e q) + set -- $(/sbin/modinfo -F vermagic "$module" | sed -e 's: .*::' -e q)
+ if [ -e "/boot/symsets-$1.tar.gz" ]; then + /sbin/modprobe --dump-modversions "$module" \
+ /sbin/modprobe --dump-modversions "$module" \
+ | sed -r -e 's:^0x0*::' -e 's:$:\t'"$1"':' + | sed -r -e 's:^0x0*::' -e 's:$:\t'"$1"':'
+ fi
+ done \ + done \
+ | sort -t $'\t' -k2 -u + | sort -t $'\t' -k2 -u
+} +}

View File

@ -24,7 +24,7 @@ License: GPL v2 or later
Group: System/Packages Group: System/Packages
Summary: Python Bindings for Manipulating RPM Packages Summary: Python Bindings for Manipulating RPM Packages
Version: 4.4.2.3 Version: 4.4.2.3
Release: 38 Release: 39
Requires: rpm = %{version} Requires: rpm = %{version}
%py_requires %py_requires
Source99: rpm.spec Source99: rpm.spec

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Mar 31 11:25:14 CEST 2009 - mmarek@suse.cz
- findksyms.diff: don't check for /boot/symsets-*, generate ksym()
requires if not present.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 19 15:42:20 CET 2009 - ro@suse.de Thu Mar 19 15:42:20 CET 2009 - ro@suse.de

View File

@ -27,7 +27,7 @@ PreReq: %insserv_prereq %fillup_prereq permissions
AutoReqProv: on AutoReqProv: on
Summary: The RPM Package Manager Summary: The RPM Package Manager
Version: 4.4.2.3 Version: 4.4.2.3
Release: 38 Release: 39
Source: rpm-%{version}.tar.bz2 Source: rpm-%{version}.tar.bz2
Source1: RPM-HOWTO.tar.bz2 Source1: RPM-HOWTO.tar.bz2
Source2: RPM-Tips.html.tar.bz2 Source2: RPM-Tips.html.tar.bz2
@ -337,7 +337,7 @@ Summary: A C library for parsing command line parameters
License: LGPL v2.1 or later License: LGPL v2.1 or later
Group: System/Libraries Group: System/Libraries
Version: 1.7 Version: 1.7
Release: 486 Release: 487
# bug437293 # bug437293
%ifarch ppc64 %ifarch ppc64
Obsoletes: popt-64bit Obsoletes: popt-64bit
@ -365,7 +365,7 @@ Summary: C Library for Parsing Command Line Parameters
License: LGPL v2.1 or later License: LGPL v2.1 or later
Group: System/Libraries Group: System/Libraries
Version: 1.7 Version: 1.7
Release: 486 Release: 487
Requires: popt = 1.7 Requires: popt = 1.7
Requires: glibc-devel Requires: glibc-devel
# bug437293 # bug437293
@ -405,6 +405,9 @@ Authors:
%doc %{_mandir}/man3/popt.3* %doc %{_mandir}/man3/popt.3*
%changelog %changelog
* Tue Mar 31 2009 mmarek@suse.cz
- findksyms.diff: don't check for /boot/symsets-*, generate ksym()
requires if not present.
* Thu Mar 19 2009 ro@suse.de * Thu Mar 19 2009 ro@suse.de
- rpm-suse_macros: suse_version to 1120 - rpm-suse_macros: suse_version to 1120
* Thu Feb 19 2009 schwab@suse.de * Thu Feb 19 2009 schwab@suse.de
@ -621,7 +624,7 @@ Authors:
- correctly mark KDE documentation as %%doc in find-lang.sh - correctly mark KDE documentation as %%doc in find-lang.sh
* Fri May 11 2007 coolo@suse.de * Fri May 11 2007 coolo@suse.de
- adding %%lang_package to simplify seperating translations - adding %%lang_package to simplify seperating translations
* Fri Apr 27 2007 wberrier@suse.de * Sat Apr 28 2007 wberrier@suse.de
- autodeps.diff - bnc #227362 - autodeps.diff - bnc #227362
-Print warning if mono assembiles are found but mono-find-* fails -Print warning if mono assembiles are found but mono-find-* fails
(solution is to make sure mono-devel is installed) (solution is to make sure mono-devel is installed)
@ -705,12 +708,12 @@ Authors:
- Allow kernel modules in packages even when the dependencies - Allow kernel modules in packages even when the dependencies
between those packages and the matching kernel packages cannot between those packages and the matching kernel packages cannot
be tracked (199474). be tracked (199474).
* Sat Sep 30 2006 agruen@suse.de * Sun Oct 01 2006 agruen@suse.de
- Make find-*.ksyms more robust. - Make find-*.ksyms more robust.
* Tue Sep 19 2006 rguenther@suse.de * Tue Sep 19 2006 rguenther@suse.de
- split rpm-python to separate spec file - split rpm-python to separate spec file
- remove python-devel BuildRequires - remove python-devel BuildRequires
* Mon Aug 14 2006 ro@suse.de * Tue Aug 15 2006 ro@suse.de
- workaround for gettext using MKINSTALLDIRS in configure.ac - workaround for gettext using MKINSTALLDIRS in configure.ac
* Wed Jun 14 2006 mls@suse.de * Wed Jun 14 2006 mls@suse.de
- make rpmlib provide rpmlib(PatchRPMs) [#184856] - make rpmlib provide rpmlib(PatchRPMs) [#184856]
@ -794,14 +797,14 @@ Authors:
- add back missing chunk of srcdefattr patch [#48870] - add back missing chunk of srcdefattr patch [#48870]
- add rpmvercmp patch from Peter Bowan - add rpmvercmp patch from Peter Bowan
- add -m32 to ix86 optflags to make --target work [#141206] - add -m32 to ix86 optflags to make --target work [#141206]
* Sat Feb 04 2006 agruen@suse.de * Sun Feb 05 2006 agruen@suse.de
- rpm-suse-kernel-module-subpackage: Allow to specify a list of - rpm-suse-kernel-module-subpackage: Allow to specify a list of
kernel flavors to build (-x) instead of specifying an exclude kernel flavors to build (-x) instead of specifying an exclude
list. list.
* Fri Feb 03 2006 mls@suse.de * Fri Feb 03 2006 mls@suse.de
- use RPMSENSE_STRONG instead of RPMSENSE_WEAK - use RPMSENSE_STRONG instead of RPMSENSE_WEAK
- drop support for EssentialFor - drop support for EssentialFor
* Wed Feb 01 2006 agruen@suse.de * Thu Feb 02 2006 agruen@suse.de
- rpm-suse-kernel-module-subpackage: Allow to specify a custom - rpm-suse-kernel-module-subpackage: Allow to specify a custom
%%files list for the kernel-specific sub-packages. Use the %%files list for the kernel-specific sub-packages. Use the
Summary and Group tags, and the %%description section from the Summary and Group tags, and the %%description section from the
@ -858,7 +861,7 @@ Authors:
- fix patchrpm code not to modify immutable header parts - fix patchrpm code not to modify immutable header parts
* Fri Nov 18 2005 ro@suse.de * Fri Nov 18 2005 ro@suse.de
- honor NO_BRP_STRIP_DEBUG in find-debuginfo.sh - honor NO_BRP_STRIP_DEBUG in find-debuginfo.sh
* Fri Oct 28 2005 mls@suse.de * Sat Oct 29 2005 mls@suse.de
- use lstat instead of stat when globbing (#129434) - use lstat instead of stat when globbing (#129434)
- add RPMTAG_PKGID and RPMTAG_HDRID - add RPMTAG_PKGID and RPMTAG_HDRID
- make python always return requires/provides/obsoletes/conflicts - make python always return requires/provides/obsoletes/conflicts
@ -935,16 +938,16 @@ Authors:
- use binutils for debuginfo packages - use binutils for debuginfo packages
* Fri Jan 14 2005 coolo@suse.de * Fri Jan 14 2005 coolo@suse.de
- name the debug package -debuginfo to sync with redhat/fedora - name the debug package -debuginfo to sync with redhat/fedora
* Mon Dec 13 2004 sndirsch@suse.de * Tue Dec 14 2004 sndirsch@suse.de
- moved chinese popt mo file to correct directory (Bug #47262) - moved chinese popt mo file to correct directory (Bug #47262)
* Fri Dec 03 2004 mls@suse.de * Fri Dec 03 2004 mls@suse.de
- fix update of rpm with same name/version/release but different - fix update of rpm with same name/version/release but different
architecture architecture
* Thu Nov 25 2004 ro@suse.de * Fri Nov 26 2004 ro@suse.de
- fix build with python-2.4 - fix build with python-2.4
* Tue Nov 16 2004 ro@suse.de * Tue Nov 16 2004 ro@suse.de
- update permissions handling - update permissions handling
* Mon Oct 18 2004 ro@suse.de * Tue Oct 19 2004 ro@suse.de
- locale rename: no -> nb - locale rename: no -> nb
* Mon Sep 27 2004 mls@suse.de * Mon Sep 27 2004 mls@suse.de
- move TE type initializaten before the addTE call to make - move TE type initializaten before the addTE call to make
@ -1034,7 +1037,7 @@ Authors:
* Thu Feb 05 2004 ro@suse.de * Thu Feb 05 2004 ro@suse.de
- linux.prov: don't block soname in versioned-requires - linux.prov: don't block soname in versioned-requires
- linux.req: disable perl-requires, it's broken - linux.req: disable perl-requires, it's broken
* Tue Feb 03 2004 schwab@suse.de * Wed Feb 04 2004 schwab@suse.de
- Readd ia64 64bit provides hack. - Readd ia64 64bit provides hack.
* Tue Feb 03 2004 kukuk@suse.de * Tue Feb 03 2004 kukuk@suse.de
- Remove all special find-requires scripts and use the default one - Remove all special find-requires scripts and use the default one
@ -1226,7 +1229,7 @@ Authors:
- Fix typo - Fix typo
* Fri Aug 09 2002 kukuk@suse.de * Fri Aug 09 2002 kukuk@suse.de
- Fix requires of rpm-devel and popt-devel - Fix requires of rpm-devel and popt-devel
* Thu Aug 08 2002 ro@suse.de * Fri Aug 09 2002 ro@suse.de
- adapt automake version in configure - adapt automake version in configure
* Fri Jul 26 2002 mls@suse.de * Fri Jul 26 2002 mls@suse.de
- Added perl/python macros from conectiva - Added perl/python macros from conectiva
@ -1254,7 +1257,7 @@ Authors:
* Tue Jul 02 2002 ke@suse.de * Tue Jul 02 2002 ke@suse.de
- Update German program messages using translations by Christian - Update German program messages using translations by Christian
Kirsch. Add as Source7; drop Patch19 [# 8442]. Kirsch. Add as Source7; drop Patch19 [# 8442].
* Thu Jun 20 2002 ro@suse.de * Fri Jun 21 2002 ro@suse.de
- automake is 1.6.2 - automake is 1.6.2
* Wed Jun 12 2002 bk@suse.de * Wed Jun 12 2002 bk@suse.de
- ppc: fix arch for elf64.prov and elf64.req to powerpc(from olh) - ppc: fix arch for elf64.prov and elf64.req to powerpc(from olh)
@ -1338,7 +1341,7 @@ Authors:
- Fix to build with new gettext. - Fix to build with new gettext.
* Mon Feb 18 2002 ro@suse.de * Mon Feb 18 2002 ro@suse.de
- added requires for suse-build-key - added requires for suse-build-key
* Mon Feb 11 2002 ro@suse.de * Tue Feb 12 2002 ro@suse.de
- tar option for bz2 is now "j" (re-added) - tar option for bz2 is now "j" (re-added)
* Mon Feb 11 2002 ma@suse.de * Mon Feb 11 2002 ma@suse.de
- unk_ugname_cached.diff: Upon building a package, unpacking sources - unk_ugname_cached.diff: Upon building a package, unpacking sources
@ -1492,7 +1495,7 @@ Authors:
- Fix config patch. - Fix config patch.
* Thu Apr 06 2000 bk@suse.de * Thu Apr 06 2000 bk@suse.de
- added /lib/libpopt.so* to filelist on s390 - added /lib/libpopt.so* to filelist on s390
* Tue Apr 04 2000 bk@suse.de * Wed Apr 05 2000 bk@suse.de
- uses autoconf and automake now - uses autoconf and automake now
- added /lib/libbz2.so* and /lib/libz.so* to filelist on s390 - added /lib/libbz2.so* and /lib/libz.so* to filelist on s390
* Sun Apr 02 2000 bk@suse.de * Sun Apr 02 2000 bk@suse.de
@ -1534,7 +1537,7 @@ Authors:
- again rebuilddb.patch - again rebuilddb.patch
* Wed Jul 14 1999 ro@suse.de * Wed Jul 14 1999 ro@suse.de
- update to 3.0.3 - update to 3.0.3
* Sun Jun 27 1999 ro@suse.de * Mon Jun 28 1999 ro@suse.de
- changed macros.in for libc5 : no "h" parameter for chown,chmod - changed macros.in for libc5 : no "h" parameter for chown,chmod
* Fri Jun 25 1999 ro@suse.de * Fri Jun 25 1999 ro@suse.de
- update to rpm-3.0.2 - update to rpm-3.0.2