From 41de9c057f10ea6a387b90fef22ae102b773264fc83214666f09fe244384dea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 4 Oct 2019 15:54:30 +0000 Subject: [PATCH] Accepting request 735094 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/735094 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pango?expand=0&rev=202 --- pango.changes | 5 +++++ pango.spec | 34 ++++++++++++++++++++++++---------- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/pango.changes b/pango.changes index 597cbc4..8e4a185 100644 --- a/pango.changes +++ b/pango.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Sep 14 13:46:54 UTC 2019 - Bjørn Lie + +- Modernize spec, prepare for possible spliting of package. + ------------------------------------------------------------------- Tue Sep 3 15:23:01 UTC 2019 - Bjørn Lie diff --git a/pango.spec b/pango.spec index 299be76..d0b8084 100644 --- a/pango.spec +++ b/pango.spec @@ -22,10 +22,11 @@ Release: 0 Summary: Library for Layout and Rendering of Text License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ -URL: http://www.pango.org/ +URL: https://pango.gnome.org/ Source0: https://download.gnome.org/sources/pango/1.44/%{name}-%{version}.tar.xz Source2: macros.pango Source99: baselibs.conf + BuildRequires: gcc-c++ BuildRequires: gtk-doc BuildRequires: help2man @@ -117,23 +118,22 @@ This package contains all necessary include files and libraries needed to develop applications that require these. %prep -%setup -q +%autosetup -p1 %build %meson \ -Dgtk_doc=true \ -Dintrospection=true \ + -Dinstall-tests=false \ %{nil} %meson_build %install %meson_install + # Install rpm macros mkdir -p %{buildroot}%_rpmmacrodir cp %{SOURCE2} %{buildroot}%_rpmmacrodir -# Remove tests, we have no need for them - FIXME if any one can figure out how to disable build of these with meson == awesome -rm -rf %{buildroot}%{_libexecdir}/installed-tests -rm -rf %{buildroot}%{_datadir}/installed-tests %post -n libpango-1_0-0 -p /sbin/ldconfig %postun -n libpango-1_0-0 -p /sbin/ldconfig @@ -141,7 +141,10 @@ rm -rf %{buildroot}%{_datadir}/installed-tests %files -n libpango-1_0-0 %license COPYING %doc NEWS README.md -%{_libdir}/lib*.so.* +%{_libdir}/libpango-1.0.so.* +%{_libdir}/libpangocairo-1.0.so.* +%{_libdir}/libpangoft2-1.0.so.* +%{_libdir}/libpangoxft-1.0.so.* %files -n typelib-1_0-Pango-1_0 %{_libdir}/girepository-1.0/Pango-1.0.typelib @@ -159,10 +162,21 @@ rm -rf %{buildroot}%{_datadir}/installed-tests %files devel %doc CODING_STYLE.md THANKS %doc %{_datadir}/gtk-doc/html/pango/ -%{_libdir}/lib*.so -%{_libdir}/pkgconfig/*.pc -%{_includedir}/pango-1.0/ -%{_datadir}/gir-1.0/*.gir %_rpmmacrodir/macros.pango +%{_includedir}/pango-1.0/ +%{_libdir}/libpango-1.0.so +%{_libdir}/libpangocairo-1.0.so +%{_libdir}/libpangoft2-1.0.so +%{_libdir}/libpangoxft-1.0.so +%{_libdir}/pkgconfig/pango.pc +%{_libdir}/pkgconfig/pangocairo.pc +%{_libdir}/pkgconfig/pangoft2.pc +%{_libdir}/pkgconfig/pangoxft.pc +%{_datadir}/gir-1.0/Pango-1.0.gir +%{_datadir}/gir-1.0/PangoCairo-1.0.gir +%{_datadir}/gir-1.0/PangoFT2-1.0.gir +%{_datadir}/gir-1.0/PangoFc-1.0.gir +%{_datadir}/gir-1.0/PangoOT-1.0.gir +%{_datadir}/gir-1.0/PangoXft-1.0.gir %changelog