[klatexformula] minor .spec cleanup, update scriptlets

Rex Dieter rdieter at fedoraproject.org
Mon Aug 18 15:38:55 UTC 2014


commit 4384fea0bbbbc4bcb9421f401e9b4445e1a4dbfc
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Aug 18 10:38:48 2014 -0500

    minor .spec cleanup, update scriptlets

 klatexformula.spec |   29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 deletions(-)
---
diff --git a/klatexformula.spec b/klatexformula.spec
index 86f6b75..ec88f96 100644
--- a/klatexformula.spec
+++ b/klatexformula.spec
@@ -1,12 +1,11 @@
 Name:             klatexformula
 Version:          3.2.10
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          Application for easy image creating from a LaTeX equation
-Group:            Applications/Publishing
 License:          GPLv2+
 URL:              http://klatexformula.sourceforge.net/
 Source0:          http://downloads.sourceforge.net/klatexformula/%{name}-%{version}.tar.bz2
-BuildRequires:    kdelibs-devel
+BuildRequires:    kdelibs4-devel
 BuildRequires:    desktop-file-utils
 BuildRequires:    help2man
 Requires:         texlive-latex
@@ -25,7 +24,6 @@ Type klatexformula_cmdl --help for more information.
 
 %package devel
 Summary:          Development files for %{name}
-Group:            Development/Libraries
 Requires:         %{name} = %{version}-%{release}
 Requires:         qt4-devel
 
@@ -35,7 +33,6 @@ developing applications that use %{name}.
 
 %package ktexteditor-plugin
 Summary:          KLatexFormula integration into KDE4's text editor
-Group:            Applications/Publishing
 Requires:         texlive-latex
 Requires:         %{name} = %{version}-%{release}
 %{?_kde4_version:Requires: kdelibs4%{?_isa} >= %{_kde4_version}}
@@ -45,7 +42,6 @@ KLatexFormula integration into KDE4's text editor.
 
 %package -n libklfbackend
 Summary:          Library for integration KLatexFormula functionality
-Group:            System Environment/Libraries
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 
 %description -n libklfbackend
@@ -54,8 +50,7 @@ KLatexFormula functionality into your programs.
 
 %package -n libklfbackend-devel
 Summary:          Development files for libklfbackend
-Group:            Development/Libraries
-Requires:         libklfbackend = %{version}-%{release}
+Requires:         libklfbackend%{?_isa} = %{version}-%{release}
 Requires:         qt4-devel
 
 %description -n libklfbackend-devel
@@ -72,6 +67,7 @@ pushd %{_target_platform}
         -DKLF_LIBKLFAPP_STATIC=OFF \
         -DKLF_LIBKLFBACKEND_STATIC=OFF \
         -DKLF_LIBKLFTOOLS_STATIC=OFF \
+        -DKLF_INSTALL_POST_UPDATEMIMEDATABASE=OFF \
         -DKLF_INSTALL_SHARE_PIXMAPS_DIR="" \
         -DKLF_NO_CMU_FONT=ON \
         -DKLF_INSTALL_LIB_DIR=%{_libdir} \
@@ -81,32 +77,32 @@ popd
 make %{?_smp_mflags} -C %{_target_platform}
 
 %install
-rm -rf %{buildroot}
-
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %check
 desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 
-%clean
-rm -rf %{buildroot}
 
 %post
 /sbin/ldconfig
-update-mime-database %{_datadir}/mime &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+touch --no-create %{_datadir}/mime/packages &>/dev/null || :
 
 %postun
 /sbin/ldconfig
-update-mime-database %{_datadir}/mime &> /dev/null || :
 if [ $1 -eq 0 ] ; then
     touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     gtk-update-icon-cache %{_datadir}/icons/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
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+update-desktop-database -q &>/dev/null || :
+update-mime-database %{?fedora:-n} %{_datadir}/mime &>/dev/null || :
 
 %post -n libklfbackend -p /sbin/ldconfig
 
@@ -149,6 +145,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_includedir}/klfbackend
 
 %changelog
+* Mon Aug 18 2014 Rex Dieter <rdieter at fedoraproject.org> 3.2.10-3
+- minor .spec cleanup, update scriptlets
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 


More information about the scm-commits mailing list