[okular] okular-part subpkg BR: libjpeg-devel

Rex Dieter rdieter at fedoraproject.org
Tue Nov 15 18:06:37 UTC 2011


commit 95fb84675d94813ea60410ca425f709978130512
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Nov 15 12:07:20 2011 -0600

    okular-part subpkg
    BR: libjpeg-devel

 okular.spec |   56 ++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 34 insertions(+), 22 deletions(-)
---
diff --git a/okular.spec b/okular.spec
index 4bbcff0..ba6d7cf 100644
--- a/okular.spec
+++ b/okular.spec
@@ -1,7 +1,7 @@
 Name:    okular 
 Summary: A document viewer
 Version: 4.7.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kdegraphics/okular
@@ -23,6 +23,7 @@ BuildRequires: desktop-file-utils
 BuildRequires: ebook-tools-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: libkipi-devel >= %{version} 
+BuildRequires: libjpeg-devel
 BuildRequires: libtiff-devel
 BuildRequires: pkgconfig(ddjvuapi) 
 BuildRequires: pkgconfig(libspectre)
@@ -32,11 +33,9 @@ BuildRequires: pkgconfig(qimageblitz)
 
 # kio_msits migrates from kdegraphics, which had Epoch: 7
 %define kio_msits_epoch 7
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}-part%{?_isa} = %{version}-%{release}
 Requires: kio_msits = %{kio_msits_epoch}:%{version}-%{release}
 Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
-# when split occurred
-Conflicts: kdegraphics < 7:4.6.95-10
 
 %description
 %{summary}.
@@ -50,10 +49,17 @@ Requires: kdelibs4-devel
 
 %package  libs 
 Summary:  Runtime files for %{name} 
-Requires: %{name} = %{version}-%{release}
+# when split occurred
+Conflicts: kdegraphics < 7:4.6.95-10
 %description libs 
 %{summary}.
 
+%package part
+Summary: Okular kpart plugin
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+%description part
+%{summary}.
+
 %package -n kio_msits
 Epoch: %{kio_msits_epoch} 
 Summary: A kioslave for displaying WinHelp files
@@ -84,6 +90,8 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+%find_lang %{name} --with-kde --without-mo
+
 
 %check
 desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop
@@ -103,40 +111,44 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 update-desktop-database -q &> /dev/null ||:
 fi
 
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
-
-%files
+%files -f %{name}.lang
 %doc COPYING 
-%{_kde4_bindir}/%{name}*
-%{_kde4_appsdir}/%{name}/
-%{_kde4_datadir}/applications/kde4/%{name}.desktop
-%{_kde4_datadir}/applications/kde4//%{name}Application_*.desktop
-%{_kde4_datadir}/config.kcfg/*.kcfg
-%{_kde4_datadir}/kde4/services/lib%{name}Generator*.desktop
-%{_kde4_datadir}/kde4/services/%{name}[A-Z]*.desktop
+%{_kde4_bindir}/okular*
+%{_kde4_datadir}/applications/kde4/okular.desktop
+%{_kde4_datadir}/applications/kde4/okularApplication_*.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_docdir}/HTML/en/%{name}/
-%{_kde4_libdir}/kde4/%{name}Generator*.so
-%{_kde4_datadir}/kde4/services/%{name}_part.desktop
-%{_kde4_datadir}/kde4/servicetypes/%{name}Generator.desktop
-%{_kde4_libdir}/kde4/%{name}part.so
 
 %files devel
 %{_kde4_includedir}/okular/
 %{_kde4_libdir}/libokularcore.so
 %{_kde4_libdir}/cmake/Okular/
 
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
 %files libs
 %{_kde4_libdir}/libokularcore.so.1*
 
+%files part
+%{_kde4_appsdir}/okular/
+%{_kde4_datadir}/config.kcfg/*.kcfg
+%{_kde4_datadir}/kde4/services/libokularGenerator*.desktop
+%{_kde4_datadir}/kde4/services/okular[A-Z]*.desktop
+%{_kde4_datadir}/kde4/services/okular_part.desktop
+%{_kde4_datadir}/kde4/servicetypes/okularGenerator.desktop
+%{_kde4_libdir}/kde4/okularGenerator*.so
+%{_kde4_libdir}/kde4/okularpart.so
+
 %files -n kio_msits
 %{_kde4_libdir}/kde4/kio_msits.so
 %{_kde4_datadir}/kde4/services/msits.protocol
 
 
 %changelog
+* Tue Nov 15 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.3-2
+- okular-part subpkg
+- BR: libjpeg-devel
+
 * Sat Oct 29 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.3-1
 - 4.7.3
 - more pkgconfig-style deps


More information about the scm-commits mailing list