From b2d29a29daa1051fdcd90f3a398ff10b31f68eff Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jul 03 2014 18:49:33 +0000 Subject: optimize mimeinfo scriptlet, .spec cleanup --- diff --git a/kdevelop.spec b/kdevelop.spec index 3f68116..9cb8aa2 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -5,13 +5,11 @@ Name: kdevelop Summary: Integrated Development Environment for C++/C Epoch: 9 Version: 4.6.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 URL: http://www.kdevelop.org/ -Group: Development/Tools Source0: http://download.kde.org/stable/kdevelop/%{version}/src/kdevelop-%{version}.tar.xz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # remove set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) line Patch0: kdevelop-4.5.0-no-rpath.patch @@ -70,14 +68,12 @@ individual needs. %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} %description devel %{summary}. %package libs Summary: %{name} runtime libraries -Group: System Environment/Libraries # helps multilib upgrades Obsoletes: kdevelop < 9:3.9.95 Requires: %{name} = %{epoch}:%{version}-%{release} @@ -103,8 +99,6 @@ make %{?_smp_mflags} -C %{_target_platform} %install -rm -rf %{buildroot} - make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %find_lang %{name} --all-name --with-kde @@ -114,28 +108,26 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kdevelop.desktop -%clean -rm -rf %{buildroot} - %post -touch --no-create %{_datadir}/icons/hicolor &> /dev/null || : +touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || : +touch --no-create %{_kde4_datadir}/mime ||: %postun if [ $1 -eq 0 ] ; then -touch --no-create %{_datadir}/icons/hicolor &> /dev/null -gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : +touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || : +gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : update-desktop-database -q &> /dev/null -update-mime-database %{_kde4_datadir}/mime &> /dev/null +touch --no-create %{_kde4_datadir}/mime ||: +update-mime-database %{?fedora:-n} %{_kde4_datadir}/mime &> /dev/null || : fi %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 %{_kde4_datadir}/mime &> /dev/null +update-mime-database %{?fedora:-n} %{_kde4_datadir}/mime &> /dev/null || : %files -f %{name}.lang -%defattr(-,root,root,-) %doc AUTHORS COPYING COPYING.DOC COPYING.LIB CHANGELOG.4.6.0 TODO NEWS %{_kde4_bindir}/kdevelop %{_kde4_bindir}/kdevelop! @@ -154,17 +146,18 @@ update-mime-database %{_kde4_datadir}/mime &> /dev/null %postun libs -p /sbin/ldconfig %files libs -%defattr(-,root,root,-) %{_kde4_libdir}/lib*.so %{_kde4_libdir}/kde4/*.so %files devel -%defattr(-,root,root,-) %{_kde4_appsdir}/cmake/modules/FindKDevelop.cmake %{_kde4_includedir}/kdevelop/ %changelog +* Thu Jul 03 2014 Rex Dieter 9:4.6.0-5 +- optimize mimeinfo scriptlet, .spec cleanup + * Sun Jun 08 2014 Fedora Release Engineering - 9:4.6.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild