From e338a9f0a14bceba329d5f0fdd1854afb282770b Mon Sep 17 00:00:00 2001 From: Rosa Date: Wed, 1 Feb 2012 17:05:20 +0400 Subject: [PATCH] Automatic import for version 0.14.2 --- .abf.yml | 2 +- json-glib.spec | 53 ++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 39 insertions(+), 16 deletions(-) diff --git a/.abf.yml b/.abf.yml index f6f9709..14cea46 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - "json-glib-0.12.6.tar.xz": 755c19d2329877393884d66126b837ce51572d78 + "json-glib-0.14.2.tar.xz": 077c5a7bfabdaefba1f4472100e29add9aa910a4 diff --git a/json-glib.spec b/json-glib.spec index 10dfc3f..e5f5ff9 100644 --- a/json-glib.spec +++ b/json-glib.spec @@ -1,18 +1,21 @@ -%define libver 1.0 -%define major 0 +%define libver 1.0 +%define major 0 +%define girmajor 1.0 %define libname %mklibname %{name} %{libver} %{major} %define develname %mklibname %{name} -d +%define girname %mklibname %{name}-gir %{girmajor} + +%define url_ver %(echo %{version}|cut -d. -f1,2) Name: json-glib -Version: 0.12.6 -Release: %mkrel 1 +Version: 0.14.2 +Release: 1 Summary: Library for JavaScript Object Notation format Group: System/Libraries License: LGPLv2+ URL: http://live.gnome.org/JsonGlib -Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{name}-%{version}.tar.xz -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Source0: http://download.gnome.org/sources/%{name}/%{url_ver}/%{name}-%{version}.tar.xz BuildRequires: glib2-devel BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc @@ -25,8 +28,7 @@ for the JavaScript Object Notation (JSON) format. %package -n %{libname} Summary: Shared libraries for %{name} Group: System/Libraries -Provides: %{name} = %{version} -Provides: lib%%{name} = %{version} +Requires: %{name} = %{version} %description -n %{libname} %{name} is a library providing serialization and deserialization support @@ -43,42 +45,63 @@ Requires: %{libname} = %{version} The %{develname} package contains libraries and header files for developing applications that use %{name}. +%package -n %{girname} +Summary: GObject Introspection interface description for %name +Group: System/Libraries +Requires: %{libname} = %{version}-%{release} +Conflicts: %{mklibname %{name}1.0-gir 1.0} < 0.13.4-3 + +%description -n %{girname} +GObject Introspection interface description for %name. + %prep %setup -q %build -%configure2_5x --enable-static=no +%configure2_5x --disable-static %make - %install rm -rf %{buildroot} %makeinstall_std +# we don't want these +find %{buildroot} -name "*.la" -exec rm -rf {} \; + +%find_lang %{name}-%{libver} + %check %make check %clean rm -rf %{buildroot} +%files -f %{name}-%{libver}.lang + %files -n %{libname} %defattr(-, root, root) %{_libdir}/lib%{name}-%{libver}.so.%{major}* -%_libdir/girepository-1.0/Json-%{libver}.typelib + +%files -n %{girname} +%{_libdir}/girepository-1.0/Json-%{girmajor}.typelib %files -n %{develname} %defattr(-,root,root,-) %doc README NEWS ChangeLog -%{_libdir}/lib%{name}-%{libver}.la +%doc %{_datadir}/gtk-doc/html/%{name}/ %{_libdir}/lib%{name}-%{libver}.so %{_libdir}/pkgconfig/%{name}-%{libver}.pc %{_includedir}/%{name}-%{libver}/ -%{_datadir}/gtk-doc/html/%{name}/ -%{_datadir}/gir-1.0/Json-%{libver}.gir +%{_datadir}/gir-1.0/Json-%{girmajor}.gir %changelog -* Wed Jun 15 2011 Götz Waschk 0.12.6-1mdv2011.0 +* Mon Oct 31 2011 Matthew Dawkins 0.14.2-1 ++ Revision: 708060 +- new version 0.14.2 + copied in changes from mga spec + +* Wed Jun 15 2011 Götz Waschk 0.12.6-1 + Revision: 685394 - new version - xz tarball