diff -r 6a62f7ecb64c -r 03d66ab4c7ca dpkg/dpkg.spec --- a/dpkg/dpkg.spec Tue Aug 28 22:15:58 2012 +0200 +++ b/dpkg/dpkg.spec Tue Aug 28 19:00:20 2012 +0200 @@ -1,6 +1,6 @@ ## ## dpkg.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2008 OpenPKG Foundation e.V. +## Copyright (c) 2000-2012 OpenPKG Foundation e.V. ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -22,8 +22,8 @@ ## # package version -%define V_tarball 1.14.24 -%define V_subdir 1.14.24 +%define V_tarball 1.16.8 +%define V_subdir 1.16.8 # package information Name: dpkg @@ -36,21 +36,17 @@ Group: Archiver License: GPL Version: %{V_tarball} -Release: 20090106 +Release: 20120800 # list of sources -Source0: http://ftp.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.gz +Source0: http://ftp.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.xz Patch0: dpkg.patch # build information -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, make, gcc, gcc::with_cxx = yes -PreReq: OpenPKG, openpkg >= 20040130 +BuildPreReq: OpenPKG, openpkg >= 20100101, make, gcc, gcc::with_cxx = yes +PreReq: OpenPKG, openpkg >= 20100101 BuildPreReq: gettext, libiconv, bzip2, zlib PreReq: gettext, libiconv, bzip2, zlib -AutoReq: no -AutoReqProv: no %description dpkg is the heart of the Debian GNU/Linux package management @@ -61,26 +57,32 @@ prog dpkg = { version = %{version} url = http://ftp.debian.org/debian/pool/main/d/dpkg/ - regex = dpkg_(__VER__)\.tar\.gz + regex = dpkg_(__VER__)\.tar\.xz } %prep %setup -q -n dpkg-%{V_subdir} %patch -p0 + %{l_shtool} subst \ + -e 's;\(defined(OSLinux)\)$;\1 || defined(OSsunos);g' \ + utils/start-stop-daemon.c %build + ( echo "ac_cv_header_kvm_h=no" + ) >config.cache CC="%{l_cc}" \ CXX="%{l_cxx}" \ CFLAGS="%{l_cflags -O}" \ CXXFLAGS="%{l_cxxflags -O}" \ - CPPFLAGS="%{l_cppflags}" \ + CPPFLAGS="%{l_cppflags} -I`pwd`" \ LDFLAGS="%{l_ldflags}" \ + LIBS="-lintl -liconv" \ ./configure \ + --cache-file=./config.cache \ --prefix=%{l_prefix} \ --mandir=%{l_prefix}/man \ --with-libiconv-prefix=%{l_prefix} \ --with-libintl-prefix=%{l_prefix} \ - --without-included-gettext \ --with-dselect \ --without-start-stop-daemon \ --with-admindir=%{l_prefix}/var/dpkg \ @@ -90,8 +92,7 @@ %{l_make} %{l_mflags -O} %install - rm -rf $RPM_BUILD_ROOT - %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT LINGUAS=doit + %{l_make} %{l_mflags} install DESTDIR="$RPM_BUILD_ROOT" strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/locale for bin in 822-date cleanup-info install-info update-alternatives; do @@ -108,5 +109,4 @@ %files -f files %clean - rm -rf $RPM_BUILD_ROOT