- fix build

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=235

python3-rpm.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov  4 08:54:25 UTC 2012 - coolo@suse.com
+
+- fix build
+
 -------------------------------------------------------------------
 Sat Sep 22 13:24:30 UTC 2012 - idonmez@suse.com
 

python3-rpm.spec

@@ -19,7 +19,6 @@
 Name:           python3-rpm
 Version:        4.10.0
 Release:        0
-#!BuildIgnore:  rpmlint-Factory
 Summary:        Python Bindings for Manipulating RPM Packages
 License:        GPL-2.0+
 Group:          System/Packages
@@ -40,7 +39,7 @@ BuildRequires:  xz-devel
 BuildRequires:  zlib-devel
 Requires:       rpm = %{version}
 %{expand:%(sed -n -e '/^Source:/,/^BuildRoot:/p' <%_sourcedir/rpm.spec)}
-%global with_python 1
+%global with_python 3
 
 %description
 The python3-rpm package contains a module that permits applications

rpm-python.spec

@@ -41,7 +41,7 @@ BuildRequires:  zlib-devel
 Requires:       rpm = %{version}
 %py_requires
 %{expand:%(sed -n -e '/^Source:/,/^BuildRoot:/p' <%_sourcedir/rpm.spec)}
-%global with_python 1
+%global with_python 2
 
 %description
 The rpm-python package contains a module that permits applications

rpm.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sun Nov  4 08:53:46 UTC 2012 - coolo@suse.com
+
+- extend the list of build essentials - 4 drop candidates
+
+-------------------------------------------------------------------
+Sun Nov  4 07:56:25 UTC 2012 - coolo@suse.com
+
+- glibc-locale is build essential too - too many things go wrong
+  without locales
+
 -------------------------------------------------------------------
 Sun Oct 28 05:20:40 UTC 2012 - coolo@suse.com
 

rpm.spec

@@ -174,20 +174,30 @@ Provides:       rpmbuild
 # SUSE's build essentials
 Requires:       binutils
 Requires:       bzip2
+Requires:       coreutils
+Requires:       diffutils
 Requires:       file
 Requires:       findutils
 Requires:       gawk
 Requires:       gcc
 Requires:       gettext-tools
 Requires:       glibc-devel
+Requires:       glibc-locale
+Requires:       grep
 Requires:       gzip
 Requires:       make
 Requires:       net-tools
 Requires:       patch
 Requires:       perl-base
+Requires:       sed
 Requires:       tar
 Requires:       util-linux
 Requires:       xz
+# drop candidates
+Requires:       cpio
+Requires:       file
+Requires:       pwdutils
+Requires:       timezone
 
 %description build
 If you want to build a rpm, you need this package. It provides rpmbuild
@@ -250,7 +260,10 @@ pushd beecrypt
 make %{?_smp_mflags}
 popd
 
-./autogen.sh --disable-dependency-tracking --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
+export PYTHON=python%{with_python}
+autoreconf -fi
+sed -i -e 's,{PYTHON_VERSION}mu,{PYTHON_VERSION}mu python${PYTHON_VERSION}m,' configure
+./configure --disable-dependency-tracking --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
 --libdir=%{_libdir} --sysconfdir=/etc --localstatedir=/var --with-lua \
 --with-vendor=suse \
 --with-selinux --with-internal-beecrypt \