diff --git a/.gcr.metadata b/.gcr.metadata index 512c23a..ccea1f1 100644 --- a/.gcr.metadata +++ b/.gcr.metadata @@ -1 +1 @@ -241acff88075bb6a8f7ee199c0e31ce6c768806e SOURCES/gcr-3.8.2.tar.xz +f7c33b8e2cb59269968afcf9aaf4f182db1c548e SOURCES/gcr-3.14.0.tar.xz diff --git a/.gitignore b/.gitignore index 4725e60..5bd899b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gcr-3.8.2.tar.xz +SOURCES/gcr-3.14.0.tar.xz diff --git a/SPECS/gcr.spec b/SPECS/gcr.spec index a443e36..9541c84 100644 --- a/SPECS/gcr.spec +++ b/SPECS/gcr.spec @@ -1,12 +1,16 @@ +%ifarch %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64 +%global has_valgrind 1 +%endif + Name: gcr -Version: 3.8.2 -Release: 4%{?dist} +Version: 3.14.0 +Release: 1%{?dist} Summary: A library for bits of crypto UI and parsing Group: Development/Libraries License: LGPLv2+ URL: http://live.gnome.org/CryptoGlue/ -Source0: http://download.gnome.org/sources/gcr/3.8/gcr-%{version}.tar.xz +Source0: http://download.gnome.org/sources/gcr/3.14/gcr-%{version}.tar.xz BuildRequires: desktop-file-utils BuildRequires: intltool @@ -19,6 +23,13 @@ BuildRequires: libgcrypt-devel BuildRequires: libtasn1-tools BuildRequires: libtasn1-devel BuildRequires: chrpath +BuildRequires: vala-devel +BuildRequires: vala-tools +BuildRequires: libxslt +BuildRequires: docbook-style-xsl +%if 0%{?has_valgrind} +BuildRequires: valgrind-devel +%endif Conflicts: gnome-keyring < 3.3.0 @@ -32,7 +43,7 @@ gck is a library for accessing PKCS#11 modules like smart cards. %package devel Summary: Development files for gcr Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel The gcr-devel package includes the header files for the gcr library. @@ -41,6 +52,10 @@ The gcr-devel package includes the header files for the gcr library. %prep %setup -q +# Use system valgrind headers instead +%if 0%{?has_valgrind} +rm -rf build/valgrind/ +%endif %build %configure --enable-introspection @@ -60,24 +75,25 @@ chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/gcr-prompter %post /sbin/ldconfig -/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : /usr/bin/update-desktop-database &> /dev/null || : /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +/bin/touch --no-create %{_datadir}/mime/packages &>/dev/null || : %postun /sbin/ldconfig -/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : /usr/bin/update-desktop-database &> /dev/null || : if [ $1 -eq 0 ] ; then /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : fi %posttrans /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : +/usr/bin/update-mime-database -n %{_datadir}/mime &> /dev/null || : %files -f %{name}.lang @@ -118,9 +134,13 @@ fi %dir %{_datadir}/gtk-doc/html %{_datadir}/gtk-doc/html/gck %{_datadir}/gtk-doc/html/gcr-3 +%{_datadir}/vala/ %changelog +* Tue May 19 2015 David King - 3.14.0-1 +- Update to 3.14.0 (#1222974) + * Fri Jan 24 2014 Daniel Mach - 3.8.2-4 - Mass rebuild 2014-01-24