1.1 --- a/dpkg/dpkg.spec Tue Aug 28 22:15:58 2012 +0200 1.2 +++ b/dpkg/dpkg.spec Tue Aug 28 19:00:20 2012 +0200 1.3 @@ -1,6 +1,6 @@ 1.4 ## 1.5 ## dpkg.spec -- OpenPKG RPM Package Specification 1.6 -## Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/> 1.7 +## Copyright (c) 2000-2012 OpenPKG Foundation e.V. <http://openpkg.net/> 1.8 ## 1.9 ## Permission to use, copy, modify, and distribute this software for 1.10 ## any purpose with or without fee is hereby granted, provided that 1.11 @@ -22,8 +22,8 @@ 1.12 ## 1.13 1.14 # package version 1.15 -%define V_tarball 1.14.24 1.16 -%define V_subdir 1.14.24 1.17 +%define V_tarball 1.16.8 1.18 +%define V_subdir 1.16.8 1.19 1.20 # package information 1.21 Name: dpkg 1.22 @@ -36,21 +36,17 @@ 1.23 Group: Archiver 1.24 License: GPL 1.25 Version: %{V_tarball} 1.26 -Release: 20090106 1.27 +Release: 20120800 1.28 1.29 # list of sources 1.30 -Source0: http://ftp.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.gz 1.31 +Source0: http://ftp.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.xz 1.32 Patch0: dpkg.patch 1.33 1.34 # build information 1.35 -Prefix: %{l_prefix} 1.36 -BuildRoot: %{l_buildroot} 1.37 -BuildPreReq: OpenPKG, openpkg >= 20040130, make, gcc, gcc::with_cxx = yes 1.38 -PreReq: OpenPKG, openpkg >= 20040130 1.39 +BuildPreReq: OpenPKG, openpkg >= 20100101, make, gcc, gcc::with_cxx = yes 1.40 +PreReq: OpenPKG, openpkg >= 20100101 1.41 BuildPreReq: gettext, libiconv, bzip2, zlib 1.42 PreReq: gettext, libiconv, bzip2, zlib 1.43 -AutoReq: no 1.44 -AutoReqProv: no 1.45 1.46 %description 1.47 dpkg is the heart of the Debian GNU/Linux package management 1.48 @@ -61,26 +57,32 @@ 1.49 prog dpkg = { 1.50 version = %{version} 1.51 url = http://ftp.debian.org/debian/pool/main/d/dpkg/ 1.52 - regex = dpkg_(__VER__)\.tar\.gz 1.53 + regex = dpkg_(__VER__)\.tar\.xz 1.54 } 1.55 1.56 %prep 1.57 %setup -q -n dpkg-%{V_subdir} 1.58 %patch -p0 1.59 + %{l_shtool} subst \ 1.60 + -e 's;\(defined(OSLinux)\)$;\1 || defined(OSsunos);g' \ 1.61 + utils/start-stop-daemon.c 1.62 1.63 %build 1.64 + ( echo "ac_cv_header_kvm_h=no" 1.65 + ) >config.cache 1.66 CC="%{l_cc}" \ 1.67 CXX="%{l_cxx}" \ 1.68 CFLAGS="%{l_cflags -O}" \ 1.69 CXXFLAGS="%{l_cxxflags -O}" \ 1.70 - CPPFLAGS="%{l_cppflags}" \ 1.71 + CPPFLAGS="%{l_cppflags} -I`pwd`" \ 1.72 LDFLAGS="%{l_ldflags}" \ 1.73 + LIBS="-lintl -liconv" \ 1.74 ./configure \ 1.75 + --cache-file=./config.cache \ 1.76 --prefix=%{l_prefix} \ 1.77 --mandir=%{l_prefix}/man \ 1.78 --with-libiconv-prefix=%{l_prefix} \ 1.79 --with-libintl-prefix=%{l_prefix} \ 1.80 - --without-included-gettext \ 1.81 --with-dselect \ 1.82 --without-start-stop-daemon \ 1.83 --with-admindir=%{l_prefix}/var/dpkg \ 1.84 @@ -90,8 +92,7 @@ 1.85 %{l_make} %{l_mflags -O} 1.86 1.87 %install 1.88 - rm -rf $RPM_BUILD_ROOT 1.89 - %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT LINGUAS=doit 1.90 + %{l_make} %{l_mflags} install DESTDIR="$RPM_BUILD_ROOT" 1.91 strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true 1.92 rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/locale 1.93 for bin in 822-date cleanup-info install-info update-alternatives; do 1.94 @@ -108,5 +109,4 @@ 1.95 %files -f files 1.96 1.97 %clean 1.98 - rm -rf $RPM_BUILD_ROOT 1.99