- drop libs package

- move the rest of old main package to devel
- rel 2

Changed files:
    gobject-introspection.spec -> 1.7

diff --git a/gobject-introspection.spec b/gobject-introspection.spec
index 4c5efae23f8d4879c3e7c846a73e5419240b8c58..4ca2f5336eaa20ae643143e3c84a98808d75ad4f 100644 (file)
--- a/gobject-introspection.spec
+++ b/gobject-introspection.spec
@@ -1,11 +1,7 @@
-# TODO:
-# - check whether gir data is needed only to build applications,
-#   if so it can be moved to -devel
-#
 Summary:       Introspection for GObject libraries
 Name:          gobject-introspection
 Version:       0.6.3
-Release:       1
+Release:       2
 License:       LGPL v2+ (giscanner) and GPL v2+ (tools)
 Group:         Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/0.6/%{name}-%{version}.tar.bz2
@@ -21,24 +17,17 @@ BuildRequires:      libtool
 BuildRequires: pkgconfig
 BuildRequires: python >= 1:2.5
 BuildRequires: python-devel >= 1:2.5
-Requires:      %{name}-libs = %{version}-%{release}
+Obsoletes:     gobject-introspection-libs < %{version}-%{release}
 Suggests:      gir-repository
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Tools for introspecting GObject-based frameworks.
 
-%package libs
-Summary:       Libraries for gobject-introspection
-Group:         Development/Libraries
-
-%description libs
-Libraries for gobject-introspection.
-
 %package devel
 Summary:       Header files for gobject-introspection library
 Group:         Development/Libraries
-Requires:      %{name}-libs = %{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
 Requires:      glib2-devel >= 2.16.0
 
 %description devel
@@ -82,21 +71,12 @@ rm $RPM_BUILD_ROOT%{py_sitedir}/giscanner/*.{a,la}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  libs -p /sbin/ldconfig
-%postun        libs -p /sbin/ldconfig
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
-%{_mandir}/man1/g-ir-compiler.1*
-%{_mandir}/man1/g-ir-generate.1*
-%{_mandir}/man1/g-ir-scanner.1*
-%dir %{py_sitedir}/giscanner
-%{py_sitedir}/giscanner/*.py[co]
-%{py_sitedir}/giscanner/_giscanner.so
-
-%files libs
-%defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgirepository-everything-1.0.so.1.0.0
 %attr(755,root,root) %ghost %{_libdir}/libgirepository-everything-1.0.so.1
 %attr(755,root,root) %{_libdir}/libgirepository-1.0.so.0.0.0
@@ -109,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/g-ir-compiler
 %attr(755,root,root) %{_bindir}/g-ir-generate
 %attr(755,root,root) %{_bindir}/g-ir-scanner
+%{_mandir}/man1/g-ir-compiler.1*
+%{_mandir}/man1/g-ir-generate.1*
+%{_mandir}/man1/g-ir-scanner.1*
 %attr(755,root,root) %{_libdir}/libgirepository-everything-1.0.so
 %attr(755,root,root) %{_libdir}/libgirepository-1.0.so
 %{_pkgconfigdir}/gobject-introspection-1.0.pc
@@ -118,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/introspection.m4
 %dir %{_datadir}/gir-1.0
 %{_datadir}/gir-1.0/*.gir
+%dir %{py_sitedir}/giscanner
+%{py_sitedir}/giscanner/*.py[co]
+%{py_sitedir}/giscanner/_giscanner.so
 
 %files static
 %defattr(644,root,root,755)