From b390233a006d6f91b2db5b08c1112f8b56a33844 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 01 2017 03:42:26 +0000 Subject: import libchamplain-0.12.15-1.el7 --- diff --git a/.gitignore b/.gitignore index 3f39d37..fa99ea6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libchamplain-0.12.4.tar.xz +SOURCES/libchamplain-0.12.15.tar.xz diff --git a/.libchamplain.metadata b/.libchamplain.metadata index 6c5cac1..02705cb 100644 --- a/.libchamplain.metadata +++ b/.libchamplain.metadata @@ -1 +1 @@ -9c6352cecb85662d2c186ba7b48f7e7053d7149d SOURCES/libchamplain-0.12.4.tar.xz +a319684a66c31556c02ed6b1d3bb9cd983822527 SOURCES/libchamplain-0.12.15.tar.xz diff --git a/SOURCES/champlain-grr.patch b/SOURCES/champlain-grr.patch deleted file mode 100644 index 6d9e4bc..0000000 --- a/SOURCES/champlain-grr.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- libchamplain-0.12.4/champlain-gtk/Makefile.am.grr 2013-04-07 16:43:57.000000000 -0400 -+++ libchamplain-0.12.4/champlain-gtk/Makefile.am 2013-07-22 16:40:59.682157606 -0400 -@@ -77,7 +77,7 @@ GtkChamplain-@CHAMPLAIN_API_VERSION@.gir - GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_NAMESPACE = GtkChamplain - GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_VERSION = @CHAMPLAIN_API_VERSION@ - GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_LIBS = libchamplain-gtk-@CHAMPLAIN_API_VERSION@.la --GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_PACKAGES = gobject-2.0 gtk+-3.0 -+GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_PACKAGES = gobject-2.0 gtk+-3.0 pangocairo - GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_FILES = $(introspection_sources) - GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_INCLUDES = Clutter-1.0 Gtk-3.0 - GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_EXPORT_PACKAGES = champlain-gtk-@CHAMPLAIN_API_VERSION@ ---- libchamplain-0.12.4/champlain/Makefile.am.grr 2013-05-16 12:23:25.000000000 -0400 -+++ libchamplain-0.12.4/champlain/Makefile.am 2013-07-22 16:40:59.682157606 -0400 -@@ -173,7 +173,7 @@ Champlain-@CHAMPLAIN_API_VERSION@.gir: l - Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_NAMESPACE = Champlain - Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_VERSION = @CHAMPLAIN_API_VERSION@ - Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_LIBS = libchamplain-@CHAMPLAIN_API_VERSION@.la --Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_PACKAGES = gobject-2.0 -+Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_PACKAGES = gobject-2.0 cogl-pango-1.0 - Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_FILES = $(introspection_sources) - Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_INCLUDES = Clutter-1.0 $(memphis_gir_include) - Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_EXPORT_PACKAGES = champlain-@CHAMPLAIN_API_VERSION@ $(memphis_package) diff --git a/SPECS/libchamplain.spec b/SPECS/libchamplain.spec index f79ad14..89ebca1 100644 --- a/SPECS/libchamplain.spec +++ b/SPECS/libchamplain.spec @@ -1,25 +1,20 @@ Summary: Map view for Clutter Name: libchamplain -Version: 0.12.4 -Release: 5%{?dist} +Version: 0.12.15 +Release: 1%{?dist} License: LGPLv2+ -Group: System Environment/Libraries URL: http://projects.gnome.org/libchamplain/ Source0: http://download.gnome.org/sources/libchamplain/0.12/%{name}-%{version}.tar.xz -Patch0: champlain-grr.patch - -Requires: gobject-introspection BuildRequires: chrpath BuildRequires: clutter-devel BuildRequires: clutter-gtk-devel +BuildRequires: gobject-introspection-devel BuildRequires: libsoup-devel BuildRequires: sqlite-devel BuildRequires: gtk3-devel BuildRequires: vala-devel -BuildRequires: vala-tools - -BuildRequires: autoconf automake libtool +BuildRequires: vala %description Libchamplain is a C library aimed to provide a ClutterActor to display @@ -27,43 +22,25 @@ rasterized maps. %package devel Summary: Development files for %{name} -Group: Development/Libraries -Requires: gobject-introspection-devel -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-gtk%{?_isa} = %{version}-%{release} +Obsoletes: %{name}-gtk-devel < 0.12.12 +Provides: %{name}-gtk-devel = %{version}-%{release} +Obsoletes: %{name}-vala < 0.12.8-1 %description devel This package contains development files for %{name}. %package gtk Summary: Gtk+ widget wrapper for %{name} -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description gtk Libchamplain-gtk is a library providing a GtkWidget to embed %{name} into Gtk+ applications. -%package gtk-devel -Summary: Development files for %{name}-gtk -Group: Development/Libraries -Requires: %{name}-devel = %{version}-%{release} -Requires: %{name}-gtk = %{version}-%{release} - -%description gtk-devel -This package contains development files for %{name}-gtk. - -%package vala -Summary: Vala bindings for %{name} -Group: Development/Libraries -Requires: %{name}-devel = %{version}-%{release} -Requires: vala - -%description vala -This package contains vala bindings for development %{name}. - %package demos Summary: Demo apps for %{name} -Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-gtk-devel = %{version}-%{release} @@ -74,9 +51,6 @@ This package contains demos for development using %{name}. %prep %setup -q -%patch0 -p1 -b .grr - -autoreconf -i -f %build %configure --disable-debug --disable-silent-rules --disable-static \ @@ -89,7 +63,7 @@ sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool make %{?_smp_mflags} %install -make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT +%make_install find $RPM_BUILD_ROOT -type f -name "*.la" -delete # Remove rpaths. @@ -104,39 +78,32 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}-gtk-*.so.* %postun gtk -p /sbin/ldconfig %files -%defattr(-,root,root,-) -%doc AUTHORS COPYING README NEWS +%license COPYING +%doc AUTHORS README NEWS +%dir %{_libdir}/girepository-1.0 %{_libdir}/girepository-1.0/Champlain-0.12.typelib %{_libdir}/%{name}-0.12.so.* %files devel -%defattr(-,root,root,-) -%doc %{_datadir}/gtk-doc/html/libchamplain +%doc %{_datadir}/gtk-doc/html/libchamplain-0.12 +%doc %{_datadir}/gtk-doc/html/libchamplain-gtk-0.12 +%dir %{_datadir}/gir-1.0 %{_datadir}/gir-1.0/Champlain-0.12.gir +%{_datadir}/gir-1.0/GtkChamplain-0.12.gir +%{_datadir}/vala/vapi/champlain-0.12.vapi +%{_datadir}/vala/vapi/champlain-gtk-0.12.vapi %{_libdir}/%{name}-0.12.so +%{_libdir}/%{name}-gtk-0.12.so %{_libdir}/pkgconfig/champlain-0.12.pc +%{_libdir}/pkgconfig/champlain-gtk-0.12.pc %{_includedir}/%{name}-0.12 +%{_includedir}/%{name}-gtk-0.12 %files gtk -%defattr(-,root,root,-) %{_libdir}/girepository-1.0/GtkChamplain-0.12.typelib %{_libdir}/%{name}-gtk-0.12.so.* -%files gtk-devel -%defattr(-,root,root,-) -%doc %{_datadir}/gtk-doc/html/libchamplain-gtk -%{_datadir}/gir-1.0/GtkChamplain-0.12.gir -%{_libdir}/%{name}-gtk-0.12.so -%{_libdir}/pkgconfig/champlain-gtk-0.12.pc -%{_includedir}/%{name}-gtk-0.12 - -%files vala -%defattr(-,root,root,-) -%{_datadir}/vala/vapi/champlain-0.12.vapi -%{_datadir}/vala/vapi/champlain-gtk-0.12.vapi - %files demos -%defattr(-,root,root,-) %doc demos/*.c %doc demos/*.h %doc demos/*.vala @@ -146,6 +113,14 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}-gtk-*.so.* %doc demos/*.osm %changelog +* Wed Mar 08 2017 Kalev Lember - 0.12.15-1 +- Update to 0.12.15 +- Resolves: #1386998 + +* Wed Sep 07 2016 Kalev Lember - 0.12.14-1 +- Update to 0.12.14 +- Resolves: #1386998 + * Mon Apr 27 2015 Dan Winship - 0.12.4-5 - Rebuild against the new cogl - Resolves: #1174513