From 68e358ba30ac5628ee4b4e8ff522a26e9a77bb8c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 19 2015 03:47:07 +0000 Subject: import libpeas-1.12.1-1.el7 --- diff --git a/.gitignore b/.gitignore index cccbe8a..6aa94c9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libpeas-1.8.0.tar.xz +SOURCES/libpeas-1.12.1.tar.xz diff --git a/.libpeas.metadata b/.libpeas.metadata index a3abd90..6455148 100644 --- a/.libpeas.metadata +++ b/.libpeas.metadata @@ -1 +1 @@ -282d3bb1b26a26efc0ba429467de03de2a71a4ff SOURCES/libpeas-1.8.0.tar.xz +220f858c2cac396fcf7b56ef6b24fa25ae3f28fb SOURCES/libpeas-1.12.1.tar.xz diff --git a/SOURCES/0001-Bug-699214-Fix-out-of-bounds-memset-in-_valist_to_pa.patch b/SOURCES/0001-Bug-699214-Fix-out-of-bounds-memset-in-_valist_to_pa.patch deleted file mode 100644 index 0d593f2..0000000 --- a/SOURCES/0001-Bug-699214-Fix-out-of-bounds-memset-in-_valist_to_pa.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 85f04f4cc32523d6506de091a04d5bb432c9cf2a Mon Sep 17 00:00:00 2001 -From: Garrett Regier -Date: Fri, 14 Jun 2013 10:30:17 -0700 -Subject: [PATCH] Bug 699214 - Fix out-of-bounds memset in - _valist_to_parameter_list - ---- - libpeas/peas-helpers.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libpeas/peas-helpers.c b/libpeas/peas-helpers.c -index 185694c..af30eec 100644 ---- a/libpeas/peas-helpers.c -+++ b/libpeas/peas-helpers.c -@@ -110,7 +110,7 @@ _valist_to_parameter_list (GType iface_type, - { - n_allocated_params += 16; - *params = g_renew (GParameter, *params, n_allocated_params); -- memset (*params + sizeof (GParameter) * (n_allocated_params - 16), -+ memset (*params + (n_allocated_params - 16), - 0, sizeof (GParameter) * 16); - } - --- -1.8.2.1 - diff --git a/SPECS/libpeas.spec b/SPECS/libpeas.spec index 114c1d3..34c779d 100644 --- a/SPECS/libpeas.spec +++ b/SPECS/libpeas.spec @@ -6,36 +6,42 @@ %global seed_option --disable-seed %endif +%if 0%{?rhel} == 0 +%global use_python3 1 +%else +%global use_python3 0 +%endif + Name: libpeas -Version: 1.8.0 -Release: 5%{?dist} +Version: 1.12.1 +Release: 1%{?dist} Summary: Plug-ins implementation convenience library Group: System Environment/Libraries License: LGPLv2+ URL: http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/ -Source0: http://ftp.acc.umu.se/pub/GNOME/sources/%{name}/1.8/%{name}-%{version}.tar.xz - -Patch0: 0001-Bug-699214-Fix-out-of-bounds-memset-in-_valist_to_pa.patch +Source0: http://ftp.acc.umu.se/pub/GNOME/sources/%{name}/1.12/%{name}-%{version}.tar.xz BuildRequires: chrpath BuildRequires: gtk3-devel >= 3.0.0 BuildRequires: pygobject3-devel BuildRequires: python-devel +%if %{use_python3} +BuildRequires: python3-devel +%endif BuildRequires: intltool BuildRequires: libtool %if %{use_seed} BuildRequires: seed-devel %endif -BuildRequires: gjs-devel BuildRequires: gtk-doc BuildRequires: glade-devel -# For the girepository-1.0 directory -Requires: gobject-introspection - BuildRequires: autoconf automake gnome-common +# For the girepository-1.0 directory +Requires: gobject-introspection%{?_isa} + %description libpeas is a convenience library making adding plug-ins support to GTK+ and glib-based applications. @@ -43,7 +49,7 @@ to GTK+ and glib-based applications. %package devel Summary: Development files for libpeas Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel This package contains development libraries and header files @@ -51,7 +57,6 @@ that are needed to write applications that use libpeas. %prep %setup -q -%patch0 -p1 %build %configure %{seed_option} @@ -66,7 +71,16 @@ rm $RPM_BUILD_ROOT/%{_libdir}/lib*.la \ # Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath chrpath --delete $RPM_BUILD_ROOT%{_bindir}/peas-demo +%if %{use_python3} +chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libpeas-1.0/loaders/libpython3loader.so +%endif +chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libpeas-1.0/loaders/libpythonloader.so +%if %{use_seed} +chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libpeas-1.0/loaders/libseedloader.so +%endif chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libpeas-gtk-1.0.so +chrpath --delete $RPM_BUILD_ROOT%{_libdir}/peas-demo/plugins/helloworld/libhelloworld.so +chrpath --delete $RPM_BUILD_ROOT%{_libdir}/peas-demo/plugins/secondtime/libsecondtime.so %find_lang libpeas @@ -90,10 +104,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : %dir %{_libdir}/libpeas-1.0/ %dir %{_libdir}/libpeas-1.0/loaders %{_libdir}/libpeas-1.0/loaders/libpythonloader.so +%if %{use_python3} +%{_libdir}/libpeas-1.0/loaders/libpython3loader.so +%endif %if %{use_seed} %{_libdir}/libpeas-1.0/loaders/libseedloader.so %endif -%{_libdir}/libpeas-1.0/loaders/libgjsloader.so %{_libdir}/girepository-1.0/*.typelib %{_datadir}/icons/hicolor/*/actions/libpeas-plugin.* @@ -110,6 +126,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : %{_datadir}/glade/catalogs/libpeas-gtk.xml %changelog +* Wed Jun 24 2015 Ray Strode - 1.12.1-1 +- Update to 1.12.1 + * Fri Jan 24 2014 Daniel Mach - 1.8.0-5 - Mass rebuild 2014-01-24