rpms/ots/devel ots.spec,1.8,1.9

[Peter Gordon (pgordon)]

Author: pgordon

Update of /cvs/extras/rpms/ots/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21392

Modified Files:
	ots.spec 
Log Message:
* Mon Apr 23 2007 Peter Gordon <peter at thecodergeek.com> - 0.4.2-11
- Remove static libraries (%_libdir/*.a).
- Fix %defattr lines in the %files listings.
- Lots of formatting/aesthetic fixes.
- Remove pkgconfig from build-time dependencies (required by glib2-devel and
  libxml2-devel).
- Add LDFLAGS to fix shared library linking: libots-1.so.0 needs to link to
  glib2 and libxml2 libraries to fix unresolved symbol errors. (Resolves bug
  #237501; thanks to Matthias Clasen for the report).
- Split off libs subpackage to avoid potential multilib conflicts.    



Index: ots.spec
===================================================================
RCS file: /cvs/extras/rpms/ots/devel/ots.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ots.spec	28 Aug 2006 04:24:45 -0000	1.8
+++ ots.spec	25 Apr 2007 06:12:30 -0000	1.9
@@ -1,72 +1,111 @@
-Name: 		ots
-Summary: 	A text summarizer
-Version: 	0.4.2
-Release: 	10%{?dist}
-License: 	GPL
+Name:		ots
+Summary:	A text summarizer
+Version:	0.4.2
+Release:	11%{?dist}
+
+License:	GPL
 URL:		http://libots.sourceforge.net/
-Group: 		System Environment/Libraries
-Source0: 	http://prdownloads.sourceforge.net/libots/ots-%{version}.tar.gz
-Patch0: 	ots-0.4.2-gcc4.patch
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Group:		System Environment/Libraries
+
+Source0:	http://prdownloads.sourceforge.net/libots/ots-%{version}.tar.gz
+Patch0:		%{name}-0.4.2-gcc4.patch
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires: 	glib2 >= 2.0
-BuildRequires: 	glib2-devel >= 2.0, libxml2-devel >= 2.4.23, pkgconfig >= 0.8
+BuildRequires:	glib2-devel >= 2.0
+BuildRequires:	libxml2-devel >= 2.4.23
+
+Requires:	%{name}-libs = %{version}-%{release}
 
 %description
 The open text summarizer is an open source tool for summarizing texts.
 The program reads a text and decides which sentences are important and
 which are not.
+
  
-%package devel
+%package	devel
 Summary: 	Libraries and include files for developing with libots.
 Group: 		Development/Libraries
-Requires: 	%{name} = %{version}
-Requires: 	pkgconfig >= 0.8, glib2 >= 2.0, glib2-devel >= 2.0
+Requires:	%{name}-libs = %{version}-%{release}
+Requires: 	glib2-devel >= 2.0
+Requires:	libxml2-devel >= 2.4.23
 
-%description devel
+%description	devel
 This package provides the necessary development libraries and include
 files to allow you to develop with libots.
 
+
+%package	libs
+Summary:	Shared libraries for %{name}
+Group:		Development/Libraries
+
+%description	libs
+The %{name}-libs package contains shared libraries used by %{name}.
+
+
 %prep
 %setup -q 
 %patch0 -p1 -b .gcc4
 
+
 %build
+%configure --with-html-dir=%{_datadir}/gtk-doc/html/ots	\
+	--disable-gtk-doc
+%{__make} LDFLAGS="-lglib-2.0 -lxml2"
 
-%configure --disable-gtk-doc \
-	--with-html-dir=%{buildroot}%{_datadir}/gtk-doc/html/ots
-make
 
 %install
 rm -rf %{buildroot}
-%makeinstall
-# Currently, ots generates empty API docs.
-rm -rf %{buildroot}/%{_datadir}/gtk-doc
-rm -f %{buildroot}%{_libdir}/*.la
+%{__make} install DESTDIR=%{buildroot}
+
 
 %clean
 rm -rf %{buildroot}
 
-%post -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%post	libs -p /sbin/ldconfig
+
+
+%postun	libs -p /sbin/ldconfig
+
 
 %files
-%defattr(-, root, root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
+%exclude %{_libdir}/*.a
+%exclude %{_libdir}/*.la
+## Currently, ots fails building gtk-doc API documentation (invalid source
+## markup), so there is no gain in attempting to store it in the final build.
+%exclude %{_datadir}/gtk-doc/
 %{_bindir}/ots
-%{_libdir}/*.so.*
-%{_mandir}/*/*
-%{_datadir}/ots
-
-%files devel
-%defattr(-,root,root)
-%{_libdir}/*.a
-%{_libdir}/*.so
-%{_includedir}/libots-1
-%{_libdir}/pkgconfig/*.pc
+%{_mandir}/man?/ots.1.*
+
+%files	libs
+%defattr(-,root,root,-)
+%doc COPYING
+%{_libdir}/libots-1.so.*
+%{_datadir}/ots/
+
+%files	devel
+%defattr(-,root,root,-)
+%doc COPYING
+%{_libdir}/libots-1.so
+%{_includedir}/libots-1/
+%{_libdir}/pkgconfig/libots-1.pc
+
 
 %changelog
+* Mon Apr 23 2007 Peter Gordon <peter at thecodergeek.com> - 0.4.2-11
+- Remove static libraries (%%_libdir/*.a).
+- Fix %%defattr lines in the %%files listings.
+- Lots of formatting/aesthetic fixes.
+- Remove pkgconfig from build-time dependencies (required by glib2-devel and
+  libxml2-devel).
+- Add LDFLAGS to fix shared library linking: libots-1.so.0 needs to link to
+  glib2 and libxml2 libraries to fix unresolved symbol errors. (Resolves bug
+  #237501; thanks to Matthias Clasen for the report).
+- Split off libs subpackage to avoid potential multilib conflicts.    
+
 * Mon Aug 27 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.4.2-10
 - Rebuild for FC6