X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=glibmm.spec;h=25200d36d8be01732188bc85750fe40b515e218b;hb=35143a6ad5063642fe20e4a3b4bbd8be8ef8799f;hp=71dea5fb228a4b2f38000c954abf6eabb502f4b7;hpb=400d54284044c2580b3a3fdd1d994742b7334a3d;p=packages%2Fglibmm.git

diff --git a/glibmm.spec b/glibmm.spec
index 71dea5f..25200d3 100644
--- a/glibmm.spec
+++ b/glibmm.spec
@@ -1,28 +1,34 @@
+# TODO
+# - make clean on -examples (remove .deps) -> & noarch subpackage
 #
 # Conditional build:
 %bcond_without	static_libs	# don't build static library
-#
+
+%define 	glib_ver 1:2.40.0
+%define		libsig_ver 1:2.2.10
 Summary:	A C++ interface for glib library
 Summary(pl.UTF-8):	Interfejs C++ dla biblioteki glib
 Name:		glibmm
-Version:	2.24.0
+Version:	2.40.0
 Release:	1
 License:	LGPL v2+
 Group:		Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.24/%{name}-%{version}.tar.bz2
-# Source0-md5:	58cec0c50bb079638265f3340565b421
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.40/%{name}-%{version}.tar.xz
+# Source0-md5:	f62754f4f5c9030f8ff43c7ed20556c2
 URL:		http://www.gtkmm.org/
 BuildRequires:	autoconf >= 2.59
-BuildRequires:	automake >= 1:1.9
-BuildRequires:	glib2-devel >= 1:2.24.0
-BuildRequires:	libsigc++-devel >= 1:2.2.0
+BuildRequires:	automake >= 1:1.11
+BuildRequires:	glib2-devel >= %{glib_ver}
+BuildRequires:	libsigc++-devel >= %{libsig_ver}
 BuildRequires:	libstdc++-devel
-BuildRequires:	libtool >= 2:1.4d
-BuildRequires:	mm-common >= 0.7
-BuildRequires:	perl-XML-Parser
+BuildRequires:	libtool >= 2:2.0
+BuildRequires:	m4
+BuildRequires:	mm-common >= 0.9.6
 BuildRequires:	pkgconfig
-Requires:	glib2 >= 1:2.24.0
-Requires:	libsigc++ >= 1:2.2.0
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
+Requires:	glib2 >= %{glib_ver}
+Requires:	libsigc++ >= %{libsig_ver}
 Obsoletes:	gtkmm-glib
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -37,8 +43,8 @@ Summary:	Header files for glibmm library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki glibmm
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	glib2-devel >= 1:2.24.0
-Requires:	libsigc++-devel >= 1:2.2.0
+Requires:	glib2-devel >= %{glib_ver}
+Requires:	libsigc++-devel >= %{libsig_ver}
 Requires:	libstdc++-devel
 Obsoletes:	gtkmm-glib-devel
 
@@ -68,6 +74,9 @@ Group:		Documentation
 Requires:	gtk-doc-common
 Provides:	glibmm-doc
 Obsoletes:	glibmm-doc
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description apidocs
 Reference documentation for glibmm.
@@ -109,7 +118,8 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 	devhelpdir=%{_gtkdocdir}/%{name}-2.4
 
 cp -r examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-rm -f $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/Makefile*
+%{__rm} $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/Makefile* \
+	$RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -132,9 +142,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libgiomm-2.4.so
 %attr(755,root,root) %{_libdir}/libglibmm-2.4.so
 %attr(755,root,root) %{_libdir}/libglibmm_generate_extra_defs-2.4.so
-%{_libdir}/libgiomm-2.4.la
-%{_libdir}/libglibmm-2.4.la
-%{_libdir}/libglibmm_generate_extra_defs-2.4.la
 %dir %{_libdir}/giomm-2.4
 %{_libdir}/giomm-2.4/include
 %dir %{_libdir}/glibmm-2.4
@@ -144,12 +151,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/glibmm-2.4/proc/pm
 %attr(755,root,root) %{_libdir}/glibmm-2.4/proc/generate_wrap_init.pl
 %attr(755,root,root) %{_libdir}/glibmm-2.4/proc/gmmproc
-%{_datadir}/glibmm-2.4
 %{_includedir}/giomm-2.4
 %{_includedir}/glibmm-2.4
 %{_pkgconfigdir}/giomm-2.4.pc
 %{_pkgconfigdir}/glibmm-2.4.pc
-%{_aclocaldir}/glibmm_check_perl.m4
 
 %if %{with static_libs}
 %files static