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

findlang.diff

@@ -1,8 +1,6 @@
-SUSE patches for find-lang.
+--- scripts/find-lang.sh	2004-06-20 20:55:19.000000000 +0200
-
++++ scripts/find-lang.sh	2008-03-21 18:13:21.489944000 +0100
---- ./scripts/find-lang.sh.orig	2004-06-20 18:55:19.000000000 +0000
+@@ -28,10 +28,10 @@
-+++ ./scripts/find-lang.sh	2005-12-19 15:22:52.000000000 +0000
-@@ -28,10 +28,10 @@ the top of the tree containing the files
  PACKAGE_NAME is the %{name} of the package. This should also be
  the basename of the .mo files.  the output is written to
  PACKAGE_NAME.lang unless \$3 is given in which case output is written
@@ -16,7 +14,7 @@ SUSE patches for find-lang.
    --all-name		match all package/domain names
    --without-mo		not find locales files
  EOF
-@@ -52,8 +52,8 @@ else NAME=$1
+@@ -52,8 +52,8 @@
  fi
  shift
  
@@ -27,7 +25,7 @@ SUSE patches for find-lang.
  MO=
  MO_NAME=$NAME.lang
  ALL_NAME=#
-@@ -61,12 +61,12 @@ NO_ALL_NAME=
+@@ -61,12 +61,12 @@
  
  while test $# -gt 0 ; do
      case "${1}" in
@@ -44,7 +42,7 @@ SUSE patches for find-lang.
  		shift
  		;;
  	--without-mo )
-@@ -85,26 +85,43 @@ while test $# -gt 0 ; do
+@@ -85,26 +85,43 @@
      esac
  done    
  
@@ -80,8 +78,9 @@ SUSE patches for find-lang.
 -'"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'$\):%dir \1:
 +'"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'$\):%dir %doc \1:
  '"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'/[a-zA-Z0-9.\_\-]/.\+\)::
- '"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'\/\)\([^/_]\+\):%lang(\2) \1\2:
+-'"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'\/\)\([^/_]\+\):%lang(\2) \1\2:
 -'"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[a-zA-Z0-9.\_\-]\+$\):%dir \1:
++'"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'\/\)\([^/_]\+\):%lang(\2) %doc \1\2:
 +'"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[a-zA-Z0-9.\_\-]\+$\):%dir %doc \1:
  '"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]/.\+\)::
 -'"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[a-zA-Z0-9.\_\-]\+\/\)\([^/_]\+\):%lang(\2) \1\2:
@@ -94,7 +93,7 @@ SUSE patches for find-lang.
  
  find $TOP_DIR -type d|sed '
  s:'"$TOP_DIR"'::
-@@ -112,12 +129,20 @@ s:'"$TOP_DIR"'::
+@@ -112,12 +129,20 @@
  '"$NO_ALL_NAME$KDE"'s:\(.*/doc/kde/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'\)$:%lang(\2) \1\2\3:
  '"$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:

macrosin.diff

@@ -47,7 +47,7 @@ Index: macros.in
  #
  #%_source_payload	w9.gzdio
 -#%_binary_payload	w9.gzdio
-+%_binary_payload	w9.bzdio
++%_binary_payload	w2.lzdio
  
  #	The signature to use and the location of configuration files for
  #	signing packages with PGP.

rpm-python.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Mar 27 14:47:18 CET 2008 - coolo@suse.de
+
+- fix buildrequires
+
 -------------------------------------------------------------------
 Fri May 25 16:20:53 CEST 2007 - mls@suse.de
 

rpm-python.spec

@@ -12,12 +12,12 @@
 
 
 Name:           rpm-python
-BuildRequires:  libbz2-devel ncurses-devel python-devel zlib-devel
+BuildRequires:  libbz2-devel lzma-alpha-devel ncurses-devel python-devel zlib-devel
 License:        GPL v2 or later
 Group:          System/Packages
 Summary:        Python Bindings for Manipulating RPM Packages
 Version:        4.4.2
-Release:        220
+Release:        221
 Requires:       rpm = %{version}
 %py_requires
 Source99:       rpm.spec
@@ -62,11 +62,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/python*
 
 %changelog
+* Thu Mar 27 2008 coolo@suse.de
+- fix buildrequires
 * Fri May 25 2007 mls@suse.de
 - fix unicode queries
 * Fri Mar 30 2007 rguenther@suse.de
 - add ncurses-devel and zlib-devel BuildRequires.
-* Thu Oct 19 2006 mls@suse.de
+* Wed Oct 18 2006 mls@suse.de
 - use rpm.spec for building instead of duplication everything
 - delete superfluous .a and .la files [#202604]
 - create .pyc and .pyo files [#205711]

rpm.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Mar 27 14:43:24 CET 2008 - coolo@suse.de
+
+- switch payload default to lzma -2 
+- flag GNOME docu as %doc (bnc#358838)
+
 -------------------------------------------------------------------
 Tue Mar 18 17:12:00 CET 2008 - mls@suse.de
 

rpm.spec

@@ -21,7 +21,7 @@ PreReq:         %insserv_prereq %fillup_prereq permissions
 AutoReqProv:    on
 Summary:        The RPM Package Manager
 Version:        4.4.2
-Release:        177
+Release:        180
 Source:         rpm-%{version}.tar.bz2
 Source1:        RPM-HOWTO.tar.bz2
 Source2:        RPM-Tips.html.tar.bz2
@@ -156,7 +156,7 @@ Summary:        Include Files and Libraries mandatory for Development.
 License:        GPL v2 or later
 Group:          System/Packages
 Requires:       rpm = %{version}
-Requires:       popt-devel zlib-devel bzip2 libbz2-devel
+Requires:       popt-devel zlib-devel bzip2 libbz2-devel lzma-alpha-devel
 
 %description devel
 This package contains the RPM C library and header files.  These
@@ -348,7 +348,7 @@ Summary:        A C library for parsing command line parameters
 License:        LGPL v2.1 or later
 Group:          System/Libraries
 Version:        1.7
-Release:        405
+Release:        408
 #
 
 %description -n popt
@@ -371,7 +371,7 @@ Summary:        C Library for Parsing Command Line Parameters
 License:        LGPL v2.1 or later
 Group:          System/Libraries
 Version:        1.7
-Release:        405
+Release:        408
 Requires:       popt = 1.7
 Requires:       glibc-devel
 
@@ -406,6 +406,9 @@ Authors:
 %doc	%{_mandir}/man3/popt.3*
 
 %changelog
+* Thu Mar 27 2008 coolo@suse.de
+- switch payload default to lzma -2
+- flag GNOME docu as %%doc (bnc#358838)
 * Tue Mar 18 2008 mls@suse.de
 - make ia32 compatible to ia64, like it was in SLES9 [bnc#367705]
 - fix memory leak and endless loops in lzma code