- updated from libglade2.spec, drop .la file, release 2

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

diff --git a/crossmingw32-libglade2.spec b/crossmingw32-libglade2.spec
index 2c0f174fba8c08e58547791dd6deeee1adf7012d..12961ec2c12438d8544bcf3b1849b6e9673c5596 100644 (file)
--- a/crossmingw32-libglade2.spec
+++ b/crossmingw32-libglade2.spec
@@ -1,14 +1,16 @@
-%define                realname   libglade2
+%define                realname libglade2
 Summary:       libglade library - cross Mingw32 version
 Summary(pl.UTF-8):     Biblioteka do ładowania definicji interfejsu generowanego programem glade - wersja skrośna dla Mingw32
 Name:          crossmingw32-%{realname}
-Version:       2.6.2
-Release:       1
+Version:       2.6.4
+Release:       2
 License:       LGPL v2+
 Group:         Development/Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/libglade/2.6/libglade-%{version}.tar.bz2
-# Source0-md5: da4f9d1c6cd1337f6ef5e2db768d8557
-URL:           http://www.gnome.org/
+# Source0-md5: d1776b40f4e166b5e9c107f1c8fe4139
+Patch0:                %{realname}-gmodule-link.patch
+Patch1:                %{realname}-no-gnome-common.patch
+URL:           https://developer.gnome.org/libglade/
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake >= 1:1.9
 BuildRequires: bison
@@ -17,7 +19,7 @@ BuildRequires:        crossmingw32-gettext
 BuildRequires: crossmingw32-gtk+2 >= 2.10.13
 BuildRequires: crossmingw32-libxml2 >= 2.6.29
 BuildRequires: libtool
-BuildRequires: pkgconfig
+BuildRequires: pkgconfig >= 1:0.15
 BuildRequires: python >= 2.0
 BuildRequires: python-modules >= 2.0
 BuildRequires: rpmbuild(macros) >= 1.197
@@ -33,10 +35,22 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %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
 %define                __cxx                   %{target}-g++
+%define                __pkgconfig_provides    %{nil}
+%define                __pkgconfig_requires    %{nil}
+
+%define                _ssp_cflags             %{nil}
+%ifnarch %{ix86}
+# arch-specific flags (like alpha's -mieee) are not valid for i386 gcc
+%define                optflags        -O2
+%endif
+# -z options are invalid for mingw linker, most of -f options are Linux-specific
+%define                filterout_ld    -Wl,-z,.*
+%define                filterout_c     -f[-a-z0-9=]*
 
 %description
 This library allows you to load user interfaces in your program, which
@@ -83,14 +97,11 @@ Biblioteka DLL libglade dla Windows.
 
 %prep
 %setup -q -n libglade-%{version}
-
-# ensure to remove workaround below when obsolete
-grep -q glade_xml_construct_from_buffer glade/glade.def && exit 1
-# missing export
-echo -e '\tglade_xml_construct_from_buffer' >> glade/glade.def
+%patch0 -p1
+%patch1 -p1
 
 %build
-export PKG_CONFIG_PATH=%{_prefix}/lib/pkgconfig
+export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
 %{__libtoolize}
 %{__glib_gettextize}
 %{__aclocal} -I m4
@@ -107,18 +118,21 @@ export PKG_CONFIG_PATH=%{_prefix}/lib/pkgconfig
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -j1 install \
        DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_dlldir}
-mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
+%{__mv} $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libglade-*.la
 
 %if 0%{!?debug:1}
 %{target}-strip --strip-unneeded -R.comment -R.note $RPM_BUILD_ROOT%{_dlldir}/*.dll
 %{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/{gtk-doc,xml}
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/libglade-convert
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{gtk-doc,xml}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -127,7 +141,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %{_libdir}/libglade-2.0.dll.a
-%{_libdir}/libglade-2.0.la
 %{_pkgconfigdir}/libglade-2.0.pc
 %{_includedir}/libglade-2.0
 
@@ -137,4 +150,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files dll
 %defattr(644,root,root,755)
-%{_dlldir}/libglade-2.0-*.dll
+%{_dlldir}/libglade-2.0-0.dll