rpms/zint/devel zint.spec,1.1,1.2

[Martin Gieseking]

Author: mgieseki

Update of /cvs/pkgs/rpms/zint/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3654

Modified Files:
	zint.spec 
Log Message:
merged -libs packages back as suggested in review


Index: zint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zint/devel/zint.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- zint.spec	14 Jun 2010 07:03:09 -0000	1.1
+++ zint.spec	14 Jun 2010 07:15:40 -0000	1.2
@@ -1,6 +1,6 @@
 Name:      zint
 Version:   2.3.2
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   A barcode generator
 License:   GPLv3+
 URL:       http://www.zint.org.uk
@@ -32,18 +32,11 @@ Features of the library:
 - Verification stage for SBN, ISBN and ISBN-13 data.
 
 
-%package libs
-Summary:       The Zint shared library
-Group:         System Environment/Libraries
-
-%description libs
-Library to generate several barcode variants.
-
 
 %package devel
 Summary:       Library and header files for %{name}
 Group:         Development/Libraries
-Requires:      %{name}-libs = %{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
 
 %description devel 
 C library and header files needed to develop applications that use 
@@ -51,6 +44,7 @@ the Zint library. The API documentation 
 http://www.zint.org.uk/zintSite/Manual.aspx
 
 
+
 %package qt
 Summary:       Zint Barcode Studio
 Group:         Applications/Text
@@ -60,25 +54,14 @@ Zint Barcode Studio is a Qt-based GUI wh
 barcodes which can then be embedded in documents or HTML pages.
 
 
-%package qt-libs
-Summary:       Zint Qt library
-Group:         System Environment/Libraries
-Requires:      %{name}-libs = %{version}-%{release}
-
-%description qt-libs
-Library which can be used to incorporate Qt barcode generation functionality 
-into other software.
-
 
 %package qt-devel
 Summary:       Library and header files for %{name}-qt
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
-Requires:      %{name}-qt-libs = %{version}-%{release}
 
 %description qt-devel 
-C library and header files needed to develop applications that use 
-the %{name}-qt-libs.
+C library and header files needed to develop applications that use libQZint.
 
 
 %prep
@@ -109,19 +92,16 @@ desktop-file-validate %{buildroot}%{_dat
 rm -rf $RPM_BUILD_ROOT
 
 
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-%post qt-libs -p /sbin/ldconfig
-%postun qt-libs -p /sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+%post qt -p /sbin/ldconfig
+%postun qt -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
 %doc COPYING readme
 %{_bindir}/%{name}
-
-%files libs
-%defattr(-,root,root,-)
 %{_libdir}/libzint.so.*
 
 %files devel
@@ -132,13 +112,10 @@ rm -rf $RPM_BUILD_ROOT
 %files qt
 %defattr(-,root,root,-)
 %{_bindir}/%{name}-qt
+%{_libdir}/libQZint.so.*
 %{_datadir}/applications/%{name}-qt.desktop
 %{_datadir}/pixmaps/%{name}.png
 
-%files qt-libs
-%defattr(-,root,root,-)
-%{_libdir}/libQZint.so.*
-
 %files qt-devel
 %defattr(-,root,root,-)
 %{_includedir}/qzint.h
@@ -146,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jun 14 2010 Martin Gieseking <martin.gieseking at uos.de> - 2.3.2-3
+- merged zint command-line utility and zint-qt back together with their libraries
+
 * Fri Jun 11 2010 Martin Gieseking <martin.gieseking at uos.de> - 2.3.2-2
 - changed Group of base and -qt package to Applications/Text
 - removed redundant Requires