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: 16-Nov-2003 13:33:17
Branch: HEAD Handle: 2003111612331501
Modified files:
openpkg-src/gtk2 gtk2.spec
openpkg-web news.txt
Log:
cleanup packaging
Summary:
Revision Changes Path
1.17 +21 -18 openpkg-src/gtk2/gtk2.spec
1.7427 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gtk2/gtk2.spec
============================================================================
$ cvs diff -u -r1.16 -r1.17 gtk2.spec
--- openpkg-src/gtk2/gtk2.spec 8 Oct 2003 07:27:34 -0000 1.16
+++ openpkg-src/gtk2/gtk2.spec 16 Nov 2003 12:33:16 -0000 1.17
@@ -40,7 +40,7 @@
Group: XWindow
License: GPL
Version: %{V_gtk}
-Release: 20031008
+Release: 20031116
# list of sources
Source0: ftp://ftp.gtk.org/pub/gtk/v%{V_gtk_major}/gtk+-%{V_gtk}.tar.gz
@@ -48,12 +48,12 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20021218, glib2 >= %{V_glib_major}
+BuildPreReq: OpenPKG, openpkg >= 20021218
+PreReq: OpenPKG, openpkg >= 20021218
BuildPreReq: X11, png, jpeg, tiff, gettext, make
-BuildPreReq: pango >= %{V_pango_major}, atk >= %{V_atk_major}
-PreReq: OpenPKG, openpkg >= 20021218, glib2 >= %{V_glib_major}
PreReq: X11, png, jpeg, tiff, gettext
-PreReq: pango >= %{V_pango_major}, atk >= %{V_atk_major}
+BuildPreReq: glib2 >= %{V_glib_major}, pango >= %{V_pango_major}, atk >=
%{V_atk_major}
+PreReq: glib2 >= %{V_glib_major}, pango >= %{V_pango_major}, atk >=
%{V_atk_major}
AutoReq: no
AutoReqProv: no
@@ -122,6 +122,7 @@
po/Makefile.in.in
%build
+ # configure package
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags tiff}" \
@@ -144,13 +145,15 @@
--disable-rebuilds \
--enable-shared \
--enable-static
+
+ # build package
%{l_make} %{l_mflags}
%install
+ # install package
rm -rf $RPM_BUILD_ROOT
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/gtk2
-
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
# provide config file
@@ -159,24 +162,24 @@
$RPM_BUILD_ROOT%{l_prefix}/etc/gtk2/gtk.immodules
# use generic library name
- mv \
- $RPM_BUILD_ROOT%{l_prefix}/lib/libgtk-x11-2.0.a \
+ mv $RPM_BUILD_ROOT%{l_prefix}/lib/libgtk-x11-2.0.a \
$RPM_BUILD_ROOT%{l_prefix}/lib/libgtk2.a
- mv \
- $RPM_BUILD_ROOT%{l_prefix}/lib/libgdk-x11-2.0.a \
+ mv $RPM_BUILD_ROOT%{l_prefix}/lib/libgdk-x11-2.0.a \
$RPM_BUILD_ROOT%{l_prefix}/lib/libgdk2.a
# clean up installation area
- rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/themes
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/gtk*/demos
- rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.so
- rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.so.*
- rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.la
- rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/gtk2/immodules/*
- rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/*-[0-9][0-9.]*
-
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/gtk2
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/locale
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.so
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.so.*
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.la
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/gtk2/immodules/*
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/*-[0-9][0-9.]*
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1
+
+ # determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%not %dir %{l_prefix}/share/aclocal' \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7426 -r1.7427 news.txt
--- openpkg-web/news.txt 16 Nov 2003 12:11:42 -0000 1.7426
+++ openpkg-web/news.txt 16 Nov 2003 12:33:15 -0000 1.7427
@@ -1,3 +1,4 @@
+16-Nov-2003: Upgraded package: P<gtk2-2.2.4-20031116>
16-Nov-2003: Upgraded package: P<atk-1.2.4-20031116>
16-Nov-2003: Upgraded package: P<pango-1.2.5-20031116>
16-Nov-2003: New package: P<xft-2.1.2-20031116>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
