From 47015fd285504be2a3f76eea08dc404bd28755ca Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Sat, 16 Aug 2014 11:19:07 -0500
Subject: [PATCH] update scriptlets, BR: kdelibs4-devel, tighten subpkg dep

---
 kbibtex.spec | 50 +++++++++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/kbibtex.spec b/kbibtex.spec
index 3fbbd90..9770a6b 100644
--- a/kbibtex.spec
+++ b/kbibtex.spec
@@ -2,7 +2,7 @@
 
 Name:       kbibtex
 Version:    0.5.1
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    A BibTeX editor for KDE
 
 Group:      Applications/Editors
@@ -10,7 +10,7 @@ License:    GPLv2+
 URL:        http://home.gna.org/kbibtex/index.html
 Source0:    http://download.gna.org/%{name}/%{branch}/%{name}-%{version}.tar.xz
 
-BuildRequires:  cmake kdelibs-devel libxslt-devel desktop-file-utils gettext
+BuildRequires:  cmake kdelibs4-devel libxslt-devel desktop-file-utils gettext
 BuildRequires:  poppler-qt4-devel
 Requires:       okular-part
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -22,8 +22,8 @@ provide a user-friendly interface to BibTeX files.
 %package  devel
 Summary:  Development files for KBibTeX
 Group:    Development/Libraries
-Requires: kbibtex = %{version}-%{release}
-Requires: kdelibs-devel libxslt-devel poppler-qt4-devel
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: kdelibs4-devel libxslt-devel poppler-qt4-devel
 
 %description devel
 The %{name}-devel package contains libraries and header files necessary for
@@ -41,29 +41,34 @@ pushd %{_target_platform}
 popd
 make %{?_smp_mflags} -C %{_target_platform}
 
+
 %install
 make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
-desktop-file-install \
-    --dir %{buildroot}%{_kde4_datadir}/applications/kde4 \
-    --delete-original \
-    %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop
+
+%check
+desktop-file-validate  $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4/%{name}.desktop
+
 
 %post
-update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun
-update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database &> /dev/null ||:
-if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
+/sbin/ldconfig
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_datadir}/mime/packages &> /dev/null || :
 
 %posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
+
+%postun
+/sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+touch --no-create %{_datadir}/mime/packages &> /dev/null || :
+update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
+fi
 
 %files
 %doc LICENSE README
@@ -76,7 +81,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_kde4_datadir}/kde4/services/%{name}part.desktop
 %{_kde4_configdir}/%{name}rc
 %{_datadir}/mime/packages/bibliography.xml
-%{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_kde4_iconsdir}/hicolor/*/apps/%{name}.*
 %{_mandir}/man1/%{name}.1.*
 
 %files devel
@@ -85,6 +90,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sat Aug 16 2014 Rex Dieter <rdieter@fedoraproject.org> 0.5.1-3
+- update scriptlets, BR: kdelibs4-devel, tighten subpkg dep
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild