OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 10-Jul-2003 11:53:01
Branch: HEAD Handle: 2003071010525901
Modified files:
openpkg-src/gnet gnet.spec
openpkg-web news.txt
Log:
no-thread support, polishing
Summary:
Revision Changes Path
1.4 +19 -2 openpkg-src/gnet/gnet.spec
1.5501 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gnet/gnet.spec
============================================================================
$ cvs diff -u -r1.3 -r1.4 gnet.spec
--- openpkg-src/gnet/gnet.spec 8 Jul 2003 14:39:49 -0000 1.3
+++ openpkg-src/gnet/gnet.spec 10 Jul 2003 09:53:00 -0000 1.4
@@ -33,7 +33,10 @@
Group: Networking
License: LGPL
Version: 1.1.9
-Release: 20030430
+Release: 20030710
+
+# package options
+%option with_threads no
# list of sources
Source0: http://www.gnetlibrary.org/src/gnet-%{version}.tar.gz
@@ -43,6 +46,13 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20030103, glib
PreReq: OpenPKG, openpkg >= 20030103, glib
+%if "%{with_threads}" == "yes"
+BuildPreReq: glib::with_threads = yes
+PreReq: glib::with_threads = yes
+%else
+BuildPreReq: glib::with_threads = no
+PreReq: glib::with_threads = no
+%endif
AutoReq: no
AutoReqProv: no
@@ -53,6 +63,10 @@
%prep
%setup -q
+ %{l_shtool} subst \
+ -e '/gtkdoc-fixxref/d' \
+ -e '/mv/s; \(\$(HTML_DIR)\) *$; $(DESTDIR)\1;' \
+ doc/Makefile.in
%build
CC="%{l_cc}" \
@@ -62,12 +76,15 @@
./configure \
--prefix=%{l_prefix} \
--disable-pthreads \
+%if "%{with_threads}" != "yes"
+ --enable-threadsafe-gethostbyname \
+%endif
--disable-shared
%{l_make} %{l_mflags -O}
%install
rm -rf $RPM_BUILD_ROOT
- %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5500 -r1.5501 news.txt
--- openpkg-web/news.txt 10 Jul 2003 09:12:43 -0000 1.5500
+++ openpkg-web/news.txt 10 Jul 2003 09:52:59 -0000 1.5501
@@ -1,3 +1,4 @@
+10-Jul-2003: Upgraded package: P<gnet-1.1.9-20030710>
10-Jul-2003: Upgraded package: P<ipaudit-0.95-20030710>
10-Jul-2003: Upgraded package: P<infozip-20030710-20030710>
10-Jul-2003: Upgraded package: P<opencdk-0.5.1-20030710>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]