- updated to 2.28.4

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

diff --git a/crossmingw32-atkmm.spec b/crossmingw32-atkmm.spec
index c8c67c1b988726ab926966e3d29f82a7339fa6f3..b0d536d659a195b52b213bd16fe01e8bbdf3d45a 100644 (file)
--- a/crossmingw32-atkmm.spec
+++ b/crossmingw32-atkmm.spec
@@ -1,12 +1,12 @@
 Summary:       A C++ interface for atk library - cross MinGW32 version
 Summary(pl.UTF-8):     Interfejs C++ dla biblioteki atk - wersja skrośna MinGW32
 Name:          crossmingw32-atkmm
-Version:       2.28.1
+Version:       2.28.4
 Release:       1
 License:       LGPL v2.1+
 Group:         Development/Libraries
 Source0:       https://download.gnome.org/sources/atkmm/2.28/atkmm-%{version}.tar.xz
-# Source0-md5: 03d9d02736645083cbb824c926750624
+# Source0-md5: e0f7271990c89a6c9987f215ba47bfc5
 URL:           https://www.gtkmm.org/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1:1.9
@@ -24,10 +24,11 @@ Requires:   crossmingw32-atk >= 2.18.0
 Requires:      crossmingw32-gcc-c++ >= 1:4.7
 Requires:      crossmingw32-glibmm >= 2.46.2
 Provides:      crossmingw32-gtkmm-atk
-Obsoletes:     crossmingw32-gtkmm-atk
+Obsoletes:     crossmingw32-gtkmm-atk < 2.22.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                no_install_post_strip   1
+%define                _enable_debug_packages  0
 
 %define                target                  i386-mingw32
 %define                target_platform         i386-pc-mingw32
@@ -63,7 +64,7 @@ Summary(pl.UTF-8):    Statyczna biblioteka atkmm (wersja skrośna MinGW32)
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Provides:      crossmingw32-gtkmm-atk-static
-Obsoletes:     crossmingw32-gtkmm-atk-static
+Obsoletes:     crossmingw32-gtkmm-atk-static < 2.22.0
 
 %description static
 Static atkmm library (cross MinGW32 version).
@@ -79,7 +80,7 @@ Requires:     crossmingw32-atk-dll >= 2.18.0
 Requires:      crossmingw32-glibmm-dll >= 2.46.2
 Requires:      wine
 Provides:      crossmingw32-gtkmm-atk-dll
-Obsoletes:     crossmingw32-gtkmm-atk-dll
+Obsoletes:     crossmingw32-gtkmm-atk-dll < 2.22.0
 
 %description dll
 DLL atkmm library for Windows.
@@ -92,8 +93,9 @@ Biblioteka DLL atkmm dla Windows.
 
 %build
 # use host gmmprocdir (before changing PKG_CONFIG_LIBDIR to cross target)
-GMMPROC_DIR=$(pkg-config --variable=gmmprocdir glibmm-2.4)
-export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig:%{_npkgconfigdir}
+# note: rpm.org sets PKG_CONFIG_PATH according to _libdir and _datadir
+GMMPROC_DIR=$(PKG_CONFIG_PATH=%{_sysprefix}/%{_lib}/pkgconfig pkg-config --variable=gmmprocdir glibmm-2.4)
+export PKG_CONFIG_PATH=%{_prefix}/lib/pkgconfig:%{_npkgconfigdir}
 mm-common-prepare --copy --force
 %{__libtoolize}
 %{__aclocal} -I build
@@ -134,7 +136,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
+%doc ChangeLog NEWS README.md
 %{_libdir}/libatkmm-1.6.dll.a
 %{_libdir}/atkmm-1.6
 %{_includedir}/atkmm-1.6