From cbe257c8e4921e0b3d8071c223626ba06bb991e3513b75c7a51d534a6bb5b043 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Thu, 21 Apr 2011 08:23:29 +0000
Subject: [PATCH] Accepting request 67443 from GNOME:Next
thanks
OBS-URL: https://build.opensuse.org/request/show/67443
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pangomm?expand=0&rev=25
---
pangomm-2.26.3.tar.bz2 | 3 ---
pangomm-2.28.1.tar.bz2 | 3 +++
pangomm.changes | 27 ++++++++++++++++++++
pangomm.spec | 58 +++++++++++++++++-------------------------
4 files changed, 53 insertions(+), 38 deletions(-)
delete mode 100644 pangomm-2.26.3.tar.bz2
create mode 100644 pangomm-2.28.1.tar.bz2
diff --git a/pangomm-2.26.3.tar.bz2 b/pangomm-2.26.3.tar.bz2
deleted file mode 100644
index d3588d1..0000000
--- a/pangomm-2.26.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b1aa7a1de1c3eaf149ec0ca4bc962b8bf454f4e484abf34333d387d32c3825e6
-size 1038428
diff --git a/pangomm-2.28.1.tar.bz2 b/pangomm-2.28.1.tar.bz2
new file mode 100644
index 0000000..c45a532
--- /dev/null
+++ b/pangomm-2.28.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2c89b4460f88f8ece0e94a3332a804ca4858a3594abd84043b2898b61ab21c1b
+size 1045536
diff --git a/pangomm.changes b/pangomm.changes
index 26bd7a5..ee8df70 100644
--- a/pangomm.changes
+++ b/pangomm.changes
@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Mon Mar 28 13:32:47 UTC 2011 - fcrozat@novell.com
+
+- Update to version 2.28.1:
+ + Avoid a tarball dependency on mm-common.
+- Changes from version 2.28.0:
+ + regenerated tarball due to changes in an m4 macro in mm-common.
+
+-------------------------------------------------------------------
+Wed Feb 23 13:04:08 UTC 2011 - adam@mizerski.pl
+
+- Update to version 2.27.1:
+ + LayoutIter: This now has a copy constructor.
+ + Layout::get_iter(): There is now a version of this method that
+ returns a LayoutIter. The version with the output parameter is
+ now deprecated.
+- Remove libsigc++2-devel and update-desktop-files BuildRequires.
+- Change BuildRequires to pkgconfig() ones:
+ + old ones: cairomm-devel, glibmm2-devel, pango-devel.
+ + pkgconfig() ones: cairomm-1.0, glibmm-2.4, pangocairo.
+- Remove explicit Requires for glibmm2-devel, cairomm-devel,
+ atk-devel and pango-devel in devel subpackage: they will
+ automatically be added the pkgconfig() way.
+- Remove Requires for devel subpackage in doc subpackage: it's not
+ really needed.
+- Pass --disable-static to configure.
+
-------------------------------------------------------------------
Fri Dec 10 00:09:52 CET 2010 - vuntz@opensuse.org
diff --git a/pangomm.spec b/pangomm.spec
index a00ab7f..5506611 100644
--- a/pangomm.spec
+++ b/pangomm.spec
@@ -1,5 +1,5 @@
#
-# spec file for package pangomm (Version 2.26.3)
+# spec file for package pangomm
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -15,51 +15,40 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
+# Update baselibs.conf when changing this
+%define so_ver -1_4-1
Name: pangomm
-BuildRequires: cairomm-devel
-BuildRequires: fdupes
-BuildRequires: gcc-c++
-BuildRequires: glibmm2-devel
-BuildRequires: libsigc++2-devel
-BuildRequires: pango-devel
-BuildRequires: update-desktop-files
-Version: 2.26.3
+Version: 2.28.1
Release: 1
Group: Development/Libraries/C and C++
License: GPLv2+ ; LGPLv2.0+
Summary: C++ interface for pango
Url: http://www.gtkmm.org
Source: %{name}-%{version}.tar.bz2
-AutoReqProv: on
+BuildRequires: fdupes
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig(cairomm-1.0)
+BuildRequires: pkgconfig(glibmm-2.4)
+BuildRequires: pkgconfig(pangocairo)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%define debug_package_requires libpangomm-1_4-1 = %{version}-%{release}
%description
pangomm provides a C++ interface to the pango library.
-
-
-Authors:
---------
- Murray Cumming <murrayc@usa.net>
- Daniel Elstner <daniel.elstner@gmx.net>
-
-%package -n libpangomm-1_4-1
+%package -n libpangomm%{so_ver}
License: GPLv2+ ; LGPLv2.0+
Group: Development/Libraries/C and C++
Summary: C++ interface for pango
-%description -n libpangomm-1_4-1
+%description -n libpangomm%{so_ver}
pangomm provides a C++ interface to the pango library.
%package devel
License: GPLv2+ ; LGPLv2.0+
Group: Development/Libraries/C and C++
-Summary: C++ interface for pango
-Requires: libpangomm-1_4-1 = %{version} glibmm2-devel cairomm-devel atk-devel pango-devel
+Summary: C++ interface for pango -- Development Files
+Requires: libpangomm%{so_ver} = %{version}
%description devel
pangomm provides a C++ interface to the pango library.
@@ -67,8 +56,7 @@ pangomm provides a C++ interface to the pango library.
%package doc
License: GPLv2+ ; LGPLv2.0+
Group: Development/Libraries/C and C++
-Summary: C++ interface for pango
-Requires: %{name}-devel = %{version}
+Summary: C++ interface for pango -- Developer Documentation
%description doc
pangomm provides a C++ interface to the pango library.
@@ -77,22 +65,22 @@ pangomm provides a C++ interface to the pango library.
%setup
%build
-%configure
+%configure --disable-static
make %{?jobs:-j%jobs}
%install
%makeinstall
-rm $RPM_BUILD_ROOT/%{_libdir}/*.la
-%fdupes $RPM_BUILD_ROOT
+rm %{buildroot}%{_libdir}/*.la
+%fdupes %{buildroot}
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-%post -n libpangomm-1_4-1 -p /sbin/ldconfig
+%post -n libpangomm%{so_ver} -p /sbin/ldconfig
-%postun -n libpangomm-1_4-1 -p /sbin/ldconfig
+%postun -n libpangomm%{so_ver} -p /sbin/ldconfig
-%files -n libpangomm-1_4-1
+%files -n libpangomm%{so_ver}
%defattr (-, root, root)
%doc AUTHORS NEWS README
%{_libdir}/*.so.*
@@ -106,8 +94,8 @@ rm -rf $RPM_BUILD_ROOT
%files doc
%defattr (-, root, root)
-%{_datadir}/devhelp/books/pangomm-1.4
-%{_datadir}/doc/pangomm-1.4
+%{_datadir}/devhelp/books/pangomm-1.4/
+%{_datadir}/doc/pangomm-1.4/
# Avoid BuildRequires on devhelp
%dir %{_datadir}/devhelp
%dir %{_datadir}/devhelp/books