cleanup and fix packaging: now uses glib2 and some patching is obsolete

gnet/gnet.spec

@@ -34,7 +34,7 @@ Class:        EVAL
 Group:        Network
 License:      LGPL
 Version:      2.0.5
-Release:      20040302
+Release:      20040410
 
 #   package options
 %option       with_threads no
@@ -45,14 +45,14 @@ Source0:      http://www.gnetlibrary.org/src/gnet-%{version}.tar.gz
 #   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 @@ AutoReqProv:  no
 
 %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 @@ AutoReqProv:  no
     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