- force %{_lib}-independent libdir

[packages/crossmingw32-glibmm.git] / crossmingw32-glibmm.spec

diff --git a/crossmingw32-glibmm.spec b/crossmingw32-glibmm.spec
index fd02de70ae4254d4ee49259c694fd2130e0d482a..e4d6678497ee5a984d97d9b940845e54ab12f0f0 100644 (file)
--- a/crossmingw32-glibmm.spec
+++ b/crossmingw32-glibmm.spec
@@ -1,23 +1,23 @@
 Summary:       A C++ interface for glib library - cross Mingw32 version
 Summary(pl.UTF-8):     Interfejs C++ dla biblioteki glib - wersja skrośna Mingw32
-%define                _realname       glibmm
-Name:          crossmingw32-%{_realname}
-Version:       2.12.7
+%define                realname        glibmm
+Name:          crossmingw32-%{realname}
+Version:       2.14.2
 Release:       1
-License:       LGPL
+License:       LGPL v2+
 Group:         Development/Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.12/%{_realname}-%{version}.tar.bz2
-# Source0-md5: fd2338d504b852ba5ddaf3e1491715cd
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.14/%{realname}-%{version}.tar.bz2
+# Source0-md5: 58b4fdc97738795a19b1f5ad37f186b4
 URL:           http://gtkmm.sourceforge.net/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 BuildRequires: crossmingw32-gcc-c++
-BuildRequires: crossmingw32-glib2 >= 2.12.9
+BuildRequires: crossmingw32-glib2 >= 2.14.0
 BuildRequires: crossmingw32-libsigc++ >= 2.0.17
-BuildRequires: pkgconfig
 BuildRequires: libtool >= 2:1.5
 BuildRequires: perl-XML-Parser
-Requires:      crossmingw32-glib2 >= 2.12.9
+BuildRequires: pkgconfig >= 1:0.15
+Requires:      crossmingw32-glib2 >= 2.14.0
 Requires:      crossmingw32-libsigc++ >= 2.0.17
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -25,10 +25,10 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                target                  i386-mingw32
 %define                target_platform         i386-pc-mingw32
-%define                arch                    %{_prefix}/%{target}
 
 %define                _sysprefix              /usr
 %define                _prefix                 %{_sysprefix}/%{target}
+%define                _libdir                 %{_prefix}/lib
 %define                _pkgconfigdir           %{_prefix}/lib/pkgconfig
 %define                _dlldir                 /usr/share/wine/windows/system
 %define                __cc                    %{target}-gcc
@@ -56,7 +56,7 @@ Statyczna biblioteka glibmm (wersja skrośna mingw32).
 Summary:       DLL glibmm library for Windows
 Summary(pl.UTF-8):     Biblioteka DLL glibmm dla Windows
 Group:         Applications/Emulators
-Requires:      crossmingw32-glib2-dll >= 2.12.9
+Requires:      crossmingw32-glib2-dll >= 2.14.0
 Requires:      crossmingw32-libsigc++-dll >= 2.0.17
 Requires:      wine
 
@@ -67,10 +67,10 @@ DLL glibmm library for Windows.
 Biblioteka DLL glibmm dla Windows.
 
 %prep
-%setup -q -n %{_realname}-%{version}
+%setup -q -n %{realname}-%{version}
 
 %build
-export PKG_CONFIG_PATH=%{_prefix}/lib/pkgconfig
+export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
 %{__libtoolize}
 %{__aclocal} -I scripts
 %{__autoconf}
@@ -112,9 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libglibmm_generate_extra_defs-2.4.dll.a
 %{_libdir}/libglibmm-2.4.la
 %{_libdir}/libglibmm_generate_extra_defs-2.4.la
-%dir %{_libdir}/%{_realname}-2.4
-%{_libdir}/%{_realname}-2.4/include
-%{_includedir}/%{_realname}-2.4
+%dir %{_libdir}/glibmm-2.4
+%{_libdir}/glibmm-2.4/include
+%{_includedir}/glibmm-2.4
 %{_pkgconfigdir}/glibmm-2.4.pc
 
 %files static