Automatic import for version 0.14.2-2

json-glib.spec

@@ -1,25 +1,25 @@
-%define libver		1.0
+%define url_ver	%(echo %{version}|cut -d. -f1,2)
+
+%define api		1.0
 %define major		0
 %define girmajor	1.0
 
-%define libname		%mklibname %{name} %{libver} %{major}
+%define libname		%mklibname %{name} %{api} %{major}
 %define develname	%mklibname %{name} -d
 %define girname		%mklibname %{name}-gir %{girmajor}
 
-%define url_ver	%(echo %{version}|cut -d. -f1,2)
+Summary:	Library for JavaScript Object Notation format
-
 Name:		json-glib
 Version:	0.14.2
-Release:	1
+Release:	2
-Summary:	Library for JavaScript Object Notation format
 Group:		System/Libraries
 License:	LGPLv2+
 URL:		http://live.gnome.org/JsonGlib
 Source0:	http://download.gnome.org/sources/%{name}/%{url_ver}/%{name}-%{version}.tar.xz
-BuildRequires:	glib2-devel
+
-BuildRequires:	gobject-introspection-devel
 BuildRequires:	gtk-doc
-Requires:	%{libname} = %{version}
+BuildRequires:	pkgconfig(glib-2.0)
+BuildRequires:	pkgconfig(gobject-introspection-1.0)
 
 %description
 %{name} is a library providing serialization and deserialization support
@@ -28,32 +28,31 @@ for the JavaScript Object Notation (JSON) format.
 %package -n %{libname}
 Summary:	Shared libraries for %{name}
 Group:		System/Libraries
-Requires:	%{name} = %{version}
+Suggests:	%{name} = %{version}
 
 %description -n %{libname}
 %{name} is a library providing serialization and deserialization support
 for the JavaScript Object Notation (JSON) format.
 
+%package -n %{girname}
+Summary:        GObject Introspection interface description for %{name}
+Group:          System/Libraries
+Conflicts:	%{mklibname %{name}1.0-gir 1.0} < 0.13.4-3
+
+%description -n %{girname}
+GObject Introspection interface description for %{name}.
 
 %package -n %{develname}
 Summary:	Development files for %{name}
 Group:		Development/C
-Provides:	lib%{name}-devel = %version-%release
+Provides:	%{name}-devel = %{version}-%{release}
 Requires:	%{libname} = %{version}
+Requires:	%{girname} = %{version}
 
 %description -n %{develname}
 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
 
@@ -62,40 +61,40 @@ GObject Introspection interface description for %name.
 %make 
 
 %install
-rm -rf %{buildroot}
 %makeinstall_std
 
 # we don't want these
 find %{buildroot} -name "*.la" -exec rm -rf {} \;
 
-%find_lang %{name}-%{libver}
+%find_lang %{name}-%{api}
 
 %check
 %make check
 
-%clean
+%files -f %{name}-%{api}.lang
-rm -rf %{buildroot}
-
-%files -f %{name}-%{libver}.lang
 
 %files -n %{libname}
-%defattr(-, root, root)
+%{_libdir}/lib%{name}-%{api}.so.%{major}*
-%{_libdir}/lib%{name}-%{libver}.so.%{major}*
 
 %files -n %{girname}
 %{_libdir}/girepository-1.0/Json-%{girmajor}.typelib
 
 %files -n %{develname}
-%defattr(-,root,root,-)
 %doc README NEWS ChangeLog
 %doc %{_datadir}/gtk-doc/html/%{name}/
-%{_libdir}/lib%{name}-%{libver}.so
+%{_libdir}/lib%{name}-%{api}.so
-%{_libdir}/pkgconfig/%{name}-%{libver}.pc
+%{_libdir}/pkgconfig/%{name}-%{api}.pc
-%{_includedir}/%{name}-%{libver}/
+%{_includedir}/%{name}-%{api}/
 %{_datadir}/gir-1.0/Json-%{girmajor}.gir
 
 
+
 %changelog
+* Sun Apr 29 2012 Matthew Dawkins <mattydaw@mandriva.org> 0.14.2-2
++ Revision: 794436
+- rebuild for typelib
+- cleaned up spec
+
 * Mon Oct 31 2011 Matthew Dawkins <mattydaw@mandriva.org> 0.14.2-1
 + Revision: 708060
 - new version 0.14.2