1.1 --- a/glib/glib.spec Fri Aug 03 15:15:17 2012 +0200
1.2 +++ b/glib/glib.spec Fri Aug 03 15:16:43 2012 +0200
1.3 @@ -1,6 +1,6 @@
1.4 ##
1.5 -## glib2.spec -- OpenPKG RPM Package Specification
1.6 -## Copyright (c) 2000-2010 OpenPKG Foundation e.V. <http://openpkg.net/>
1.7 +## glib.spec -- OpenPKG RPM Package Specification
1.8 +## Copyright (c) 2000-2012 OpenPKG Foundation e.V. <http://openpkg.net/>
1.9 ##
1.10 ## Permission to use, copy, modify, and distribute this software for
1.11 ## any purpose with or without fee is hereby granted, provided that
1.12 @@ -22,11 +22,11 @@
1.13 ##
1.14
1.15 # package version
1.16 -%define V_glib2_major 2.25
1.17 -%define V_glib2_minor 13
1.18 +%define V_major 2.32
1.19 +%define V_minor 3
1.20
1.21 # package information
1.22 -Name: glib2
1.23 +Name: glib
1.24 Summary: The Gtk Utility Library
1.25 URL: http://www.gtk.org/
1.26 Vendor: The Gtk Project
1.27 @@ -35,23 +35,21 @@
1.28 Class: BASE
1.29 Group: Algorithm
1.30 License: GPL
1.31 -Version: %{V_glib2_major}.%{V_glib2_minor}
1.32 -Release: 20101020
1.33 +Version: %{V_major}.%{V_minor}
1.34 +Release: 20120713
1.35
1.36 # package options
1.37 %option with_threads yes
1.38
1.39 # list of sources
1.40 -Source0: ftp://ftp.gnome.org/pub/gnome/sources/glib/%{V_glib2_major}/glib-%{version}.tar.gz
1.41 -Patch0: glib2.patch
1.42 +Source0: http://ftp.gnome.org/pub/gnome/sources/glib/%{V_major}/glib-%{version}.tar.xz
1.43 +Patch0: glib.patch
1.44
1.45 # build information
1.46 -Prefix: %{l_prefix}
1.47 -BuildRoot: %{l_buildroot}
1.48 -BuildPreReq: OpenPKG, openpkg >= 20100101, perl, make, pkgconfig
1.49 -PreReq: OpenPKG, openpkg >= 20100101, perl
1.50 -BuildPreReq: gettext, libiconv, pcre, pcre::with_utf8 = yes
1.51 -PreReq: gettext, libiconv, pcre, pcre::with_utf8 = yes
1.52 +BuildPreReq: OpenPKG, openpkg >= 20120101, perl, make
1.53 +PreReq: OpenPKG, openpkg >= 20120101, perl
1.54 +BuildPreReq: gettext, libiconv, pcre, pcre::with_utf8 = yes, libffi
1.55 +PreReq: gettext, libiconv, pcre, pcre::with_utf8 = yes, libffi
1.56
1.57 %description
1.58 GLib is the low-level core library that originally was split out
1.59 @@ -60,9 +58,9 @@
1.60 loop, threads, dynamic loading, and an object system.
1.61
1.62 %track
1.63 - prog glib2 = {
1.64 + prog glib = {
1.65 version = %{version}
1.66 - url = ftp://ftp.gnome.org/pub/gnome/sources/glib/%{V_glib2_major}/
1.67 + url = http://ftp.gnome.org/pub/gnome/sources/glib/%{V_major}/
1.68 regex = glib-(__VER__)\.tar\.(gz|bz2)
1.69 }
1.70
1.71 @@ -83,29 +81,29 @@
1.72 -e 's;/gmodule-2\.0\.pc;/gmodule-x.x.pc;g' \
1.73 -e 's;/gio-unix-2\.0\.pc;/gio-unix-x.x.pc;g' \
1.74 -e 's;/gio-2\.0\.pc;/gio-x.x.pc;g' \
1.75 - -e 's;/glib-2\.0;/glib2;g' \
1.76 - -e 's;/gobject-2\.0;/gobject2;g' \
1.77 - -e 's;/gthread-2\.0;/gthread2;g' \
1.78 - -e 's;/gmodule-2\.0;/gmodule2;g' \
1.79 - -e 's;/gio-unix-2\.0;/gio-unix2;g' \
1.80 - -e 's;/gio-2\.0;/gio2;g' \
1.81 + -e 's;/glib-2\.0;/glib;g' \
1.82 + -e 's;/gobject-2\.0;/gobject;g' \
1.83 + -e 's;/gthread-2\.0;/gthread;g' \
1.84 + -e 's;/gmodule-2\.0;/gmodule;g' \
1.85 + -e 's;/gio-unix-2\.0;/gio-unix;g' \
1.86 + -e 's;/gio-2\.0;/gio;g' \
1.87 -e 's;/glib-x\.x\.pc;/glib-2.0.pc;g' \
1.88 -e 's;/gobject-x\.x\.pc;/gobject-2.0.pc;g' \
1.89 -e 's;/gthread-x\.x\.pc;/gthread-2.0.pc;g' \
1.90 -e 's;/gmodule-x\.x\.pc;/gmodule-2.0.pc;g' \
1.91 -e 's;/gio-unix-x\.x\.pc;/gio-unix-2.0.pc;g' \
1.92 -e 's;/gio-x\.x\.pc;/gio-2.0.pc;g' \
1.93 - -e 's;lib\(g[a-z]*\)-2\.0;lib\12;g' \
1.94 + -e 's;lib\(g[a-z]*\)-2\.0;lib\1;g' \
1.95 `find . -name Makefile.in -print` \
1.96 m4macros/glib-2.0.m4
1.97 %{l_shtool} subst \
1.98 - -e 's;/glib-2\.0;/glib2;g' \
1.99 - -e 's;/gobject-2\.0;/gobject2;g' \
1.100 - -e 's;/gthread-2\.0;/gthread2;g' \
1.101 - -e 's;/gmodule-2\.0;/gmodule2;g' \
1.102 - -e 's;/gio-unix-2\.0;/gio-unix2;g' \
1.103 - -e 's;/gio-2\.0;/gio2;g' \
1.104 - -e 's;-l\(g[a-z]*\)-2\.0;-l\12;g' \
1.105 + -e 's;/glib-2\.0;/glib;g' \
1.106 + -e 's;/gobject-2\.0;/gobject;g' \
1.107 + -e 's;/gthread-2\.0;/gthread;g' \
1.108 + -e 's;/gmodule-2\.0;/gmodule;g' \
1.109 + -e 's;/gio-unix-2\.0;/gio-unix;g' \
1.110 + -e 's;/gio-2\.0;/gio;g' \
1.111 + -e 's;-l\(g[a-z]*\)-2\.0;-l\1;g' \
1.112 *-2.0.pc.in
1.113 libs=""
1.114 %if "%{with_threads}" == "yes"
1.115 @@ -118,6 +116,10 @@
1.116 CPPFLAGS="%{l_cppflags}" \
1.117 LDFLAGS="%{l_ldflags}" \
1.118 LIBS="$libs" \
1.119 + LIBFFI_CFLAGS="%{l_cppflags}" \
1.120 + LIBFFI_LIBS="%{l_ldflags} -lffi" \
1.121 + PCRE_CFLAGS="%{l_cppflags pcre .}" \
1.122 + PCRE_LIBS="%{l_ldflags} -lpcre" \
1.123 PERL="%{l_prefix}/bin/perl" \
1.124 PERL_PATH="%{l_prefix}/bin/perl" \
1.125 GREP="grep" \
1.126 @@ -125,25 +127,22 @@
1.127 --prefix=%{l_prefix} \
1.128 --mandir=%{l_prefix}/man \
1.129 --with-libiconv=gnu \
1.130 - --disable-debug \
1.131 - --disable-shared \
1.132 --with-pcre=system \
1.133 %if "%{with_threads}" == "yes"
1.134 - --enable-threads \
1.135 -%else
1.136 - --disable-threads \
1.137 + --with-threads=posix \
1.138 %endif
1.139 --disable-gtk-doc \
1.140 - --disable-dtrace
1.141 + --disable-dtrace \
1.142 + --disable-fam \
1.143 + --disable-debug \
1.144 + --disable-shared
1.145
1.146 # build package
1.147 %{l_make} %{l_mflags}
1.148
1.149 %install
1.150 - rm -rf $RPM_BUILD_ROOT
1.151 -
1.152 # install package
1.153 - %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
1.154 + %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
1.155
1.156 # strip down installation
1.157 rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
1.158 @@ -161,5 +160,4 @@
1.159 %files -f files
1.160
1.161 %clean
1.162 - rm -rf $RPM_BUILD_ROOT
1.163
