rpms/fbreader/devel fbreader.spec,1.19,1.20

[Michel Alexandre Salim]

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13607

Modified Files:
	fbreader.spec 
Log Message:
* Thu Sep 17 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.7-3
- Split out zlibrary and zlibrary-ui subpackages (fixes bz# 523946)



Index: fbreader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/devel/fbreader.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- fbreader.spec	24 Jul 2009 22:32:18 -0000	1.19
+++ fbreader.spec	18 Sep 2009 04:29:53 -0000	1.20
@@ -1,7 +1,6 @@
-# rebuild with --with qt4 to build optional qt4 UI
 Name:           fbreader
 Version:        0.10.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        E-book reader
 
 Group:          Applications/Publishing
@@ -15,11 +14,10 @@ Patch1:         fbreader-optflags.patch
 Patch3:         fbreader-defaults.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  expat-devel bzip2-devel liblinebreak-static
+BuildRequires:  expat-devel bzip2-devel liblinebreak-devel
 BuildRequires:  gtk2-devel fribidi-devel libcurl-devel
 BuildRequires:  libjpeg-devel desktop-file-utils
-%{?_with_qt4:BuildRequires: qt4-devel}
-#Requires:       
+BuildRequires:  qt4-devel
 
 %description
 FBReader is an e-book reader, with the following main features:
@@ -46,6 +44,50 @@ FBReader is an e-book reader, with the f
 * Screen rotation by 90, 180 and 270 degrees.
 
 
+%package -n     zlibrary
+Summary:        Cross-platform GUI library
+Group:          System Environment/Libraries
+Requires:       zlibrary-ui = %{version}-%{release}
+
+%description -n zlibrary
+ZLibrary is a cross-platform library to build applications running on
+desktop Linux, Windows, and different Linux-based PDAs.
+
+
+%package -n     zlibrary-devel
+Summary:        Development files for zlibrary
+Group:          Development/Libraries
+Requires:       zlibrary = %{version}-%{release}
+
+%description -n zlibrary-devel
+This package contains the libraries amd header files that are needed
+for writing applications with Zlibrary.
+
+
+%package -n     zlibrary-ui-gtk
+Summary:        GTK+ interface module for ZLibrary
+Group:          System Environment/Libraries
+Provides:       zlibrary-ui
+
+%description -n zlibrary-ui-gtk
+ZLibrary is a cross-platform library to build applications running on
+desktop Linux, Windows, and different Linux-based PDAs.
+
+This package provides a GTK+-based UI for ZLibrary.
+
+
+%package -n     zlibrary-ui-qt4
+Summary:        Qt4 interface module for ZLibrary
+Group:          System Environment/Libraries
+Provides:       zlibrary-ui
+
+%description -n zlibrary-ui-qt4
+ZLibrary is a cross-platform library to build applications running on
+desktop Linux, Windows, and different Linux-based PDAs.
+
+This package provides a Qt4-based UI for ZLibrary.
+
+
 %prep
 %setup -q
 %patch0 -p1 -b .desktop-file
@@ -61,27 +103,24 @@ make %{?_smp_mflags} -C zlibrary/text TA
      LIBDIR=%{_libdir} UI_TYPE=dummy
 make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=gtk
-#make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt
-%if 0%{?_with_qt4:1}
 make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=qt4
-%endif
 make %{?_smp_mflags} -C fbreader TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=dummy
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make -C zlibrary/core do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
+make -C zlibrary/core do_install do_install_dev \
+     DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=dummy
-make -C zlibrary/text do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
+make -C zlibrary/text do_install do_install_dev \
+     DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=dummy
 make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=gtk
-%if 0%{?_with_qt4:1}
 make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=qt4
-%endif
 make -C fbreader do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
      UI_TYPE=dummy
 
@@ -96,26 +135,51 @@ desktop-file-install --vendor="fedora" \
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p /sbin/ldconfig
+%post -n zlibrary -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun -n zlibrary -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
 %doc fbreader/LICENSE
 %{_bindir}/FBReader
-%{_libdir}/lib*.so.*
-%{_libdir}/zlibrary
 %{_datadir}/FBReader
 %{_datadir}/applications/fedora-FBReader.desktop
 %{_datadir}/pixmaps/FBReader.png
 %{_datadir}/pixmaps/FBReader
 %{_datadir}/zlibrary
 
+%files -n zlibrary
+%defattr(-,root,root,-)
+%doc fbreader/LICENSE
+%{_libdir}/lib*.so.*
+%dir %{_libdir}/zlibrary
+%dir %{_libdir}/zlibrary/ui
+%exclude %{_datadir}/zlibrary/keynames-*.xml
+%{_datadir}/zlibrary
+
+%files -n zlibrary-devel
+%defattr(-,root,root,-)
+%{_includedir}/*
+%{_libdir}/lib*.so
+
+%files -n zlibrary-ui-gtk
+%defattr(-,root,root,-)
+%{_libdir}/zlibrary/ui/zlui-gtk.so
+%{_datadir}/zlibrary/keynames-gtk.xml
+
+%files -n zlibrary-ui-qt4
+%defattr(-,root,root,-)
+%{_libdir}/zlibrary/ui/zlui-qt4.so
+%{_datadir}/zlibrary/keynames-qt4.xml
+
 
 
 %changelog
+* Thu Sep 17 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.7-3
+- Split out zlibrary and zlibrary-ui subpackages (fixes bz# 523946)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild