OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=15

2007-05-16 22:32:19 +00:00 · 2007-05-16 22:32:19 +00:00 · bde43395ac
commit bde43395ac
parent 20b3067a90
6 changed files with 43 additions and 10 deletions
--- a/autodeps.diff
+++ b/autodeps.diff
@ -2,7 +2,7 @@ Some (probably SUSE specific) changes to linux.prov and linux.req

 --- ./autodeps/linux.prov.orig	2002-04-08 19:13:35.000000000 +0000
 +++ ./autodeps/linux.prov	2005-12-17 01:49:17.000000000 +0000
-@@ -2,60 +2,71 @@
+@@ -2,60 +2,72 @@
 
 # This script reads filenames from STDIN and outputs any relevant provides
 # information that needs to be included in the package.
@ -93,8 +93,9 @@ Some (probably SUSE specific) changes to linux.prov and linux.req
 +#
 +# --- Mono exes/dlls
 +: ${MONO_PREFIX=/usr}
-+[ -x $MONO_PREFIX/bin/mono -a -n "$monolist" ] &&
+if [ -x $MONO_PREFIX/bin/mono -a -n "$monolist" ] ; then
 +    printf "%s\n" "${monolist[@]}" | MONO_PATH=$MONO_PREFIX/lib${MONO_PATH:+:$MONO_PATH} prefix=$MONO_PREFIX $MONO_PREFIX/bin/mono-find-provides || echo "WARNING: MONO RPM PROVIDES WERE NOT GENERATED FOR THIS BUILD!!" 1>&2
+fi
 +
 +#
 +# --- Kernel module exported symbols
@ -227,7 +228,7 @@ Some (probably SUSE specific) changes to linux.prov and linux.req
 	    print LIBNAME "(" $4 ")'$lib64'";
 	}
     '
-@@ -118,17 +122,28 @@ done | sort -u
+@@ -118,17 +122,29 @@ done | sort -u
 
 #
 # --- Perl modules.
@ -251,8 +252,9 @@ Some (probably SUSE specific) changes to linux.prov and linux.req
 +#
 +# --- Mono exes/dlls
 +: ${MONO_PREFIX=/usr}
-+[ -x $MONO_PREFIX/bin/mono -a -n "$monolist" ] &&
+if [ -x $MONO_PREFIX/bin/mono -a -n "$monolist" ] ; then
 +    printf "%s\n" "${monolist[@]}" | MONO_PATH=$MONO_PREFIX/lib${MONO_PATH:+:$MONO_PATH} prefix=$MONO_PREFIX $MONO_PREFIX/bin/mono-find-requires || echo "WARNING: MONO RPM REQUIRES WERE NOT GENERATED FOR THIS BUILD!!" 1>&2
+fi
 +
 +#
 +# --- Kernel module imported symbols
--- a/findlang.diff
+++ b/findlang.diff
@ -99,9 +99,9 @@ SUSE patches for find-lang.
 '"$ALL_NAME$KDE"'s:\(.*/doc/kde/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+/\)::
 '"$ALL_NAME$KDE"'s:\(.*/doc/kde/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+$\):%lang(\2) \1\2\3:
 +'"$NO_ALL_NAME$KDE"'s:\(.*/kde.*share/doc/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'/\)::
-+'"$NO_ALL_NAME$KDE"'s:\(.*/kde.*share/doc/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'\)$:%lang(\2) \1\2\3:
+'"$NO_ALL_NAME$KDE"'s:\(.*/kde.*share/doc/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'\)$:%lang(\2) %doc \1\2\3:
 +'"$ALL_NAME$KDE"'s:\(.*/kde.*share/doc/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+/\)::
-+'"$ALL_NAME$KDE"'s:\(.*/kde.*share/doc/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+$\):%lang(\2) \1\2\3:
+'"$ALL_NAME$KDE"'s:\(.*/kde.*share/doc/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+$\):%lang(\2) %doc \1\2\3:
 s:^\([^%].*\)::
 s:%lang(C) ::
 -/^$/d' >> $MO_NAME
--- a/rpm-python.spec
+++ b/rpm-python.spec
@ -16,7 +16,7 @@ License:        GNU General Public License (GPL)
 Group:          System/Packages
 Summary:        Python Bindings for Manipulating RPM Packages
 Version:        4.4.2
-Release:        112
+Release:        117
 Requires:       rpm = %{version}

 %py_requires
--- a/10
+++ b/10
@ -457,3 +457,13 @@
 # find-supplements.ksyms parses this macro directly out of the spec file:
 %supplements_kernel_module() \
 	%{expand:%(if ! rpm -q kernel-syms > /dev/null; then echo "%fail Please add the kernel-syms package to BuildRequires"; fi)}
+
+# Template for lang sub-package.
+%lang_package \
+%package lang\
+Summary: Languages for package %{name}\
+Group: System/Localization\
+Requires: %{name} = %{version}\
+%description lang\
+Provides translations to the package %{name}.
+
--- a/rpm.changes
+++ b/rpm.changes
@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed May 16 12:16:44 CEST 2007 - mls@suse.de
+
+- fix autodeps.diff mono logic
+
+-------------------------------------------------------------------
+Mon May 14 13:47:02 CEST 2007 - coolo@suse.de
+
+- correctly mark KDE documentation as %doc in find-lang.sh
+
+-------------------------------------------------------------------
+Fri May 11 14:34:35 CEST 2007 - coolo@suse.de
+
+- adding %lang_package to simplify seperating translations
+
 -------------------------------------------------------------------
 Sat Apr 28 00:43:30 CEST 2007 - wberrier@suse.de

--- a/rpm.spec
+++ b/rpm.spec
@ -20,7 +20,7 @@ PreReq:         %insserv_prereq %fillup_prereq popt = %{popt_version} permission
 Autoreqprov:    on
 Summary:        The RPM Package Manager
 Version:        4.4.2
-Release:        105
+Release:        107
 Source:         rpm-%{version}.tar.bz2
 Source1:        RPM-HOWTO.tar.bz2
 Source2:        RPM-Tips.html.tar.bz2
@ -321,7 +321,7 @@ Summary:        A C library for parsing command line parameters
 License:        GNU Library General Public License v. 2.0 and 2.1 (LGPL)
 Group:          System/Libraries
 Version:        1.7
-Release:        333
+Release:        335
 #

 %description -n popt
@ -344,7 +344,7 @@ Summary:        C Library for Parsing Command Line Parameters
 License:        GNU Library General Public License v. 2.0 and 2.1 (LGPL)
 Group:          System/Libraries
 Version:        1.7
-Release:        333
+Release:        335
 Requires:       popt = 1.7
 Requires:       glibc-devel

@ -380,6 +380,12 @@ Authors:
 %doc	%{_mandir}/man3/popt.3*

 %changelog
+* Wed May 16 2007 - mls@suse.de
+- fix autodeps.diff mono logic
+* Mon May 14 2007 - coolo@suse.de
+- correctly mark KDE documentation as %%doc in find-lang.sh
+* Fri May 11 2007 - coolo@suse.de
+- adding %%lang_package to simplify seperating translations
 * Sat Apr 28 2007 - wberrier@suse.de
 - autodeps.diff - bnc #227362
  -Print warning if mono assembiles are found but mono-find-* fails