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, openpkg-re Date: 22-Dec-2002 11:02:48
Branch: HEAD Handle: 2002122210024701
Modified files:
openpkg-re/vcheck vc.glib2
openpkg-src/glib2 glib2.spec
openpkg-web news.txt
Log:
upgrading package: glib2 2.0.7 -> 2.2.0
Summary:
Revision Changes Path
1.4 +2 -2 openpkg-re/vcheck/vc.glib2
1.8 +23 -14 openpkg-src/glib2/glib2.spec
1.2359 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-re/vcheck/vc.glib2
============================================================
$ cvs diff -u -r1.3 -r1.4 vc.glib2
--- openpkg-re/vcheck/vc.glib2 5 Nov 2002 08:56:27 -0000 1.3
+++ openpkg-re/vcheck/vc.glib2 22 Dec 2002 10:02:47 -0000 1.4
@@ -2,8 +2,8 @@
}
prog glib2 = {
- version = 2.0.7
- url = ftp://ftp.gtk.org/pub/gtk/v2.0/
+ version = 2.2.0
+ url = ftp://ftp.gtk.org/pub/gtk/v2.2/
regex = glib-(__VER__)\.tar\.gz
}
Index: openpkg-src/glib2/glib2.spec
============================================================
$ cvs diff -u -r1.7 -r1.8 glib2.spec
--- openpkg-src/glib2/glib2.spec 20 Dec 2002 19:31:17 -0000 1.7
+++ openpkg-src/glib2/glib2.spec 22 Dec 2002 10:02:48 -0000 1.8
@@ -23,6 +23,10 @@
## SUCH DAMAGE.
##
+# package version
+%define V_glib 2.2.0
+%define V_gtk_major 2.2
+
# package information
Name: glib2
Summary: The Gtk Utility Library
@@ -32,25 +36,25 @@
Distribution: OpenPKG [EVAL]
Group: Algorithm
License: GPL
-Version: 2.0.7
-Release: 20021105
+Version: %{V_glib}
+Release: 20021222
# list of sources
-Source0: ftp://ftp.gtk.org/pub/gtk/v2.0/glib-%{version}.tar.gz
+Source0: ftp://ftp.gtk.org/pub/gtk/v%{V_gtk_major}/glib-%{V_glib}.tar.gz
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, pkgconfig, gettext
-PreReq: OpenPKG, openpkg >= 20020206
+BuildPreReq: OpenPKG, openpkg >= 20020206, gettext, pkgconfig >= 0.14.0
+PreReq: OpenPKG, openpkg >= 20020206, gettext, pkgconfig >= 0.14.0
AutoReq: no
AutoReqProv: no
%description
- GLib is the low-level core library that forms the basis of GTK+
- and GNOME. It provides data structure handling for C, portability
- wrappers, and interfaces for such runtime functionality as an
- event loop, threads, dynamic loading, and an object system.
+ GLib is the low-level core library that forms the basis of Gtk+. It
+ provides data structure handling for C, portability wrappers, and
+ interfaces for such runtime functionality as an event loop, threads,
+ dynamic loading, and an object system.
Options: none
@@ -60,22 +64,27 @@
%build
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
- CPPFLAGS="-I%{l_prefix}/include" \
+ CPPFLAGS="%{l_cppflags}" \
+ LDFLAGS="%{l_ldflags}" \
./configure \
--prefix=%{l_prefix} \
--disable-debug \
--disable-threads \
- --disable-shared \
- --with-included-gettext
+ --disable-shared
%{l_make} %{l_mflags -O}
%install
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
- rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/charset.alias
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/locale
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/glib-2.0
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/gtk-doc
%{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
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.2358 -r1.2359 news.txt
--- openpkg-web/news.txt 22 Dec 2002 09:51:09 -0000 1.2358
+++ openpkg-web/news.txt 22 Dec 2002 10:02:47 -0000 1.2359
@@ -1,3 +1,4 @@
+22-Dec-2002: Upgraded package: P<glib2-2.2.0-20021222>
22-Dec-2002: Upgraded package: P<pkgconfig-0.14.0-20021222>
22-Dec-2002: Upgraded package: P<tsmc-5.1.5.6-20021222>
22-Dec-2002: Upgraded package: P<ncurses-5.3.20021221-20021222>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
