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

diff --git a/crossmingw32-libglade2.spec b/crossmingw32-libglade2.spec
index 0254daf62f31b488bdd61f0a289c0370f8592289..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.4
-Release:       1
+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: d1776b40f4e166b5e9c107f1c8fe4139
-URL:           http://www.gnome.org/
+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
@@ -38,13 +40,17 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %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
+# -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
@@ -91,6 +97,8 @@ Biblioteka DLL libglade dla Windows.
 
 %prep
 %setup -q -n libglade-%{version}
+%patch0 -p1
+%patch1 -p1
 
 %build
 export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
@@ -110,18 +118,21 @@ export PKG_CONFIG_LIBDIR=%{_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
@@ -130,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
 
@@ -140,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

diff --git a/libglade2-gmodule-link.patch b/libglade2-gmodule-link.patch
new file mode 100644 (file)
index 0000000..2f94870
--- /dev/null
+++ b/libglade2-gmodule-link.patch
@@ -0,0 +1,12 @@
+--- libglade-2.6.4/configure.in~       2009-03-17 14:19:01.000000000 +0000
++++ libglade-2.6.4/configure.in        2014-12-31 18:18:28.589184305 +0000
+@@ -46,7 +46,8 @@
+   libxml-2.0 >= required_libxml_version dnl
+   atk >= required_atk_version dnl
+   gtk+-2.0 >= required_gtk_version dnl
+-  glib-2.0 >= required_glib_version])
++  glib-2.0 >= required_glib_version dnl
++  gmodule-2.0 >= required_glib_version])
+ 
+ AC_MSG_CHECKING([for native Win32])
+ case "$host" in

diff --git a/libglade2-no-gnome-common.patch b/libglade2-no-gnome-common.patch
new file mode 100644 (file)
index 0000000..4c1e499
--- /dev/null
+++ b/libglade2-no-gnome-common.patch
@@ -0,0 +1,11 @@
+--- libglade-2.6.4/configure.in.orig   2019-09-06 15:32:03.258675443 +0200
++++ libglade-2.6.4/configure.in        2019-09-06 16:01:31.702428295 +0200
+@@ -15,8 +15,6 @@
+ 
+ AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2])
+ 
+-GNOME_COMMON_INIT
+-
+ if test "$enable_debug" != "no"; then
+   AC_DEFINE([DEBUG],[1],[enable use of LIBGLADE_DEBUG environment variable])
+ fi