OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-re Date: 28-Nov-2003 22:34:41
Branch: HEAD Handle: 2003112821344001
Modified files:
openpkg-re/vcheck vc.apt
openpkg-src/apt apt.spec
Log:
shit happens: apt4rpm has _horrible_ Perl run-time dependencies I've
overlooked and so is unfortunately not acceptable for us because we
treat Apt as a bootstrapping tool. So, backout my apt4rpm change again
:-(
Summary:
Revision Changes Path
1.3 +0 -5 openpkg-re/vcheck/vc.apt
1.7 +37 -71 openpkg-src/apt/apt.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.apt
============================================================================
$ cvs diff -u -r1.2 -r1.3 vc.apt
--- openpkg-re/vcheck/vc.apt 28 Nov 2003 21:15:41 -0000 1.2
+++ openpkg-re/vcheck/vc.apt 28 Nov 2003 21:34:40 -0000 1.3
@@ -8,9 +8,4 @@
url = http://moin.conectiva.com.br/AptRpm
regex = apt-(__VER__)\.tar\.bz2
}
-prog apt:apt4rpm = {
- version = 0.65.3
- url = http://prdownloads.sourceforge.net/apt4rpm/
- regex = apt4rpm-(__VER__)\.tar\.bz2
-}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apt/apt.spec
============================================================================
$ cvs diff -u -r1.6 -r1.7 apt.spec
--- openpkg-src/apt/apt.spec 28 Nov 2003 21:15:43 -0000 1.6
+++ openpkg-src/apt/apt.spec 28 Nov 2003 21:34:41 -0000 1.7
@@ -24,9 +24,8 @@
##
# package version
-%define V_apt_base 0.5.15
-%define V_apt_rev 3
-%define V_apt4rpm 0.65.3
+%define V_base 0.5.15
+%define V_rev 3
# package information
Name: apt
@@ -37,14 +36,13 @@
Distribution: OpenPKG [EVAL]
Group: Bootstrapping
License: GPL
-Version: %{V_apt_base}.%{V_apt_rev}
+Version: %{V_base}.%{V_rev}
Release: 20031128
# list of sources
-Source0:
http://moin.conectiva.com.br/files/AptRpm/attachments/apt-%{V_apt_base}cnc%{V_apt_rev}.tar.bz2
-Source1:
http://osdn.dl.sourceforge.net/sourceforge/apt4rpm/apt4rpm-%{V_apt4rpm}.tar.bz2
-Source2: apt.conf
-Source3: rpmpriorities
+Source0:
http://moin.conectiva.com.br/files/AptRpm/attachments/apt-%{V_base}cnc%{V_rev}.tar.bz2
+Source1: apt.conf
+Source2: rpmpriorities
Patch0: apt.patch
# build information
@@ -63,9 +61,7 @@
Dependencies are automatically handled.
%prep
- %setup -q -c
- %setup -q -T -D -a 1
- cd apt-%{V_apt_base}cnc%{V_apt_rev}
+ %setup -q -n apt-%{V_base}cnc%{V_rev}
%patch -p0 -P 0
# replace hard-coded paths with OpenPKG ones
@@ -85,70 +81,40 @@
%{l_prefix}/bin/autoconf
%build
- # configure and build Apt base package
- ( cd apt-%{V_apt_base}cnc%{V_apt_rev}
- # configure package
- defines="-DOLD_FLATSCHEME"
- case "%{l_platform -t}" in
- *sunos* ) defines="$defines -DOPENPKG_SOLARIS" ;;
- esac
- CC="%{l_cc}" \
- CPPFLAGS="%{l_cppflags} `%{l_prefix}/bin/rpm-config --cppflags` $defines" \
- CFLAGS="%{l_cflags} `%{l_prefix}/bin/rpm-config --cflags`" \
- LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/rpm-config --ldflags`" \
- ./configure \
- --prefix=%{l_prefix} \
- --libdir=%{l_prefix}/lib/apt \
- --localstatedir=%{l_prefix}/var/apt \
- --disable-shared \
- --enable-static \
- --disable-nls \
- --disable-docs
-
- # disable localization stuff
- %{l_shtool} subst \
- -e 's;^POFILES =.*$;POFILES =;g' \
- -e 's;^GMOFILES =.*$;GMOFILES =;g' \
- -e 's;^DUMMYPOFILES =.*$;DUMMYPOFILES =;g' \
- -e 's;^CATALOGS =.*$;CATALOGS =;g' \
- po/Makefile
-
- # build package
- %{l_make} %{l_mflags}
- ) || exit $?
-
- # configure and build Apt4RPM add-on package
- ( cd apt4rpm-%{V_apt4rpm}
- %{l_shtool} subst \
- -e 's;/${PACKAGE};;' \
- configure
- PATH="@l_prefix@/lib/openpkg:$PATH"
- ./configure \
- --prefix=%{l_prefix} \
- --libdir=%{l_prefix}/lib/apt \
- --enable-docs=no
- %{l_make} %{l_mflags}
- ) || exit $?
+ # configure package
+ defines="-DOLD_FLATSCHEME"
+ case "%{l_platform -t}" in
+ *sunos* ) defines="$defines -DOPENPKG_SOLARIS" ;;
+ esac
+ CC="%{l_cc}" \
+ CPPFLAGS="%{l_cppflags} `%{l_prefix}/bin/rpm-config --cppflags` $defines" \
+ CFLAGS="%{l_cflags} `%{l_prefix}/bin/rpm-config --cflags`" \
+ LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/rpm-config --ldflags`" \
+ ./configure \
+ --prefix=%{l_prefix} \
+ --libdir=%{l_prefix}/lib/apt \
+ --localstatedir=%{l_prefix}/var/apt \
+ --disable-shared \
+ --enable-static \
+ --disable-nls \
+ --disable-docs
+
+ # disable localization stuff
+ %{l_shtool} subst \
+ -e 's;^POFILES =.*$;POFILES =;g' \
+ -e 's;^GMOFILES =.*$;GMOFILES =;g' \
+ -e 's;^DUMMYPOFILES =.*$;DUMMYPOFILES =;g' \
+ -e 's;^CATALOGS =.*$;CATALOGS =;g' \
+ po/Makefile
+
+ # build package
+ %{l_make} %{l_mflags}
%install
rm -rf $RPM_BUILD_ROOT
- # install Apt base package
- ( cd apt-%{V_apt_base}cnc%{V_apt_rev}
- %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
- ) || exit $?
-
- # install Apt4RPM add-on package
- ( cd apt4rpm-%{V_apt4rpm}
- %{l_shtool} subst \
- -e 's;$(MAKE) $(AM_MAKEFLAGS) install-data-hook;true;' \
- Makefile
- %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
- ) || exit $?
-
- # remove unnecessary files
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/apt4rpm
+ # install package
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
# remove file that conflicts with 'grep' package
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/charset.alias
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
