diff --git a/glib2/glib2.spec b/glib2/glib2.spec index e4e71e046e..006b7591b8 100644 --- a/glib2/glib2.spec +++ b/glib2/glib2.spec @@ -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 @@ Packager: The OpenPKG Project 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 @@ AutoReqProv: no %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