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-web Date: 30-Nov-2003 11:59:55
Branch: HEAD Handle: 2003113010595301
Added files:
openpkg-src/apt apt-man.tar
Modified files:
openpkg-src/apt apt.spec
openpkg-web news.txt
Log:
add pre-generated manual pages and cleanup packaging a little bit more
Summary:
Revision Changes Path
1.1 BLOB openpkg-src/apt/apt-man.tar
1.11 +28 -12 openpkg-src/apt/apt.spec
1.7621 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
(cd openpkg-src/apt && \
uudecode <<'@@ .' && \
xdelta patch apt-man.tar.xdelta /dev/null apt-man.tar && \
rm -f apt-man.tar.xdelta)
Index: openpkg-src/apt/apt-man.tar
============================================================================
begin 664 apt-man.tar.xdelta
M)5A$6C`P-"4````(`!$`$`````````````````````!S:&EE;&$N-3DQ,S(N
M;G5L;'-H:65L82XU.3$S,BYA;&[EMAIL PROTECTED]"```
M``````-C8&[EMAIL PROTECTED]@,[EMAIL PROTECTED]&SAEO?CC5`<[EMAIL PROTECTED]<````````
)52581%HP,#0E
`
end
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apt/apt.spec
============================================================================
$ cvs diff -u -r1.10 -r1.11 apt.spec
--- openpkg-src/apt/apt.spec 29 Nov 2003 22:13:43 -0000 1.10
+++ openpkg-src/apt/apt.spec 30 Nov 2003 10:59:54 -0000 1.11
@@ -37,7 +37,7 @@
Group: Bootstrapping
License: GPL
Version: %{V_base}.%{V_rev}
-Release: 20031129
+Release: 20031130
# list of sources
Source0:
http://moin.conectiva.com.br/files/AptRpm/attachments/apt-%{V_base}cnc%{V_rev}.tar.bz2
@@ -47,6 +47,7 @@
Source4: translate.list
Source5: rpmpriorities
Source6: preferences
+Source7: apt-man.tar
Patch0: apt.patch
# build information
@@ -75,7 +76,7 @@
*sunos* ) l_rpmlibs_extra="${l_rpmlibs_extra} -lsocket" ;;
esac
find . -type f ! -name "*.orig" -print | \
- xargs %{l_shtool} subst \
+ xargs %{l_shtool} subst -s \
%{l_value -s l_prefix} \
-e "s;@l_rpmlibs_base@;${l_rpmlibs_base};g" \
-e "s;@l_rpmlibs_extra@;${l_rpmlibs_extra};g"
@@ -119,33 +120,48 @@
# 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
+ # install pre-generated manual pages
+ %{l_tar} xf %{SOURCE apt-man.tar}
+ %{l_shtool} mkdir -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man5 \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man8
+ %{l_shtool} install -c -m 644 \
+ apt-man/*.5 $RPM_BUILD_ROOT%{l_prefix}/man/man5/
+ %{l_shtool} install -c -m 644 \
+ apt-man/*.8 $RPM_BUILD_ROOT%{l_prefix}/man/man8/
- # create directory for local state
+ # create directories for local state
for dir in lib/lists lib/lists/partial cache/archives/partial; do
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/var/apt/$dir
done
- # install default (blank) configuration files
+ # install default configuration files
%{l_shtool} mkdir -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/etc/apt/apt \
- $RPM_BUILD_ROOT%{l_prefix}/etc/apt/apt.conf.d
+ $RPM_BUILD_ROOT%{l_prefix}/etc/apt/apt.conf.d \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/apt/vendor.list.d \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/apt/sources.list.d \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/apt/translate.list.d
%{l_shtool} install -c -m 644 %{l_value -s -a} \
- %{SOURCE apt.conf} \
- %{SOURCE rpmpriorities} %{SOURCE preferences} \
+ %{SOURCE apt.conf} %{SOURCE rpmpriorities} %{SOURCE preferences} \
%{SOURCE sources.list} %{SOURCE vendors.list} %{SOURCE translate.list} \
$RPM_BUILD_ROOT%{l_prefix}/etc/apt/
+ %{l_shtool} install -c -m 644 \
+ doc/examples/configure-index \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/apt/apt.conf.idx
# strip down installation
- strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/charset.alias
+ strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
strip $RPM_BUILD_ROOT%{l_prefix}/lib/apt/methods/* >/dev/null 2>&1 || true
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
- '%config %{l_prefix}/etc/apt/*'
+ '%config %{l_prefix}/etc/apt/apt.conf' \
+ '%config %{l_prefix}/etc/apt/rpmpriorities' \
+ '%config %{l_prefix}/etc/apt/preferences' \
+ '%config %{l_prefix}/etc/apt/*.list'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7620 -r1.7621 news.txt
--- openpkg-web/news.txt 30 Nov 2003 08:51:22 -0000 1.7620
+++ openpkg-web/news.txt 30 Nov 2003 10:59:53 -0000 1.7621
@@ -1,3 +1,4 @@
+30-Nov-2003: Upgraded package: P<apt-0.5.15.3-20031130>
30-Nov-2003: Upgraded package: P<ncurses-5.3.20031129-20031130>
<<<<<<< news.txt
30-Nov-2003: Upgraded package: P<postfix-2.0.16-20031130>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
