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 Date: 10-Apr-2004 12:20:02
Branch: HEAD Handle: 2004041011200200
Modified files:
openpkg-src/gnet gnet.spec
Log:
cleanup and fix packaging: now uses glib2 and some patching is
obsolete
Summary:
Revision Changes Path
1.12 +9 -12 openpkg-src/gnet/gnet.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gnet/gnet.spec
============================================================================
$ cvs diff -u -r1.11 -r1.12 gnet.spec
--- openpkg-src/gnet/gnet.spec 2 Mar 2004 15:40:53 -0000 1.11
+++ openpkg-src/gnet/gnet.spec 10 Apr 2004 10:20:02 -0000 1.12
@@ -34,7 +34,7 @@
Group: Network
License: LGPL
Version: 2.0.5
-Release: 20040302
+Release: 20040410
# package options
%option with_threads no
@@ -45,14 +45,14 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, glib
-PreReq: OpenPKG, openpkg >= 20040130, glib
+BuildPreReq: OpenPKG, openpkg >= 20040130, glib2
+PreReq: OpenPKG, openpkg >= 20040130, glib2
%if "%{with_threads}" == "yes"
-BuildPreReq: glib::with_threads = yes
-PreReq: glib::with_threads = yes
+BuildPreReq: glib2::with_threads = yes
+PreReq: glib2::with_threads = yes
%else
-BuildPreReq: glib::with_threads = no
-PreReq: glib::with_threads = no
+BuildPreReq: glib2::with_threads = no
+PreReq: glib2::with_threads = no
%endif
AutoReq: no
AutoReqProv: no
@@ -71,10 +71,6 @@
%prep
%setup -q
- %{l_shtool} subst \
- -e '/gtkdoc-fixxref/d' \
- -e '/mv/s; \(\$(HTML_DIR)\) *$; $(DESTDIR)\1;' \
- doc/Makefile.in
%build
CC="%{l_cc}" \
@@ -98,7 +94,8 @@
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
- '%not %dir %{l_prefix}/share/aclocal'
+ '%not %dir %{l_prefix}/share/aclocal' \
+ '%not %dir %{l_prefix}/lib/pkgconfig'
%files -f files
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
