[monodevelop] Minor spec file cleanup Fix usage of scriptlets

chkr chkr at fedoraproject.org
Sun Apr 3 23:27:28 UTC 2011


commit 19222a1226447abb748dcc3d517cc1e9105a1182
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Mon Apr 4 01:27:26 2011 +0200

    Minor spec file cleanup
    Fix usage of scriptlets

 monodevelop.spec |   29 +++++++++++++----------------
 1 files changed, 13 insertions(+), 16 deletions(-)
---
diff --git a/monodevelop.spec b/monodevelop.spec
index b06dba2..e13b907 100644
--- a/monodevelop.spec
+++ b/monodevelop.spec
@@ -6,7 +6,7 @@
 
 Name:           monodevelop
 Version:        2.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A full-featured IDE for Mono and Gtk#
 
 Group:          Development/Tools
@@ -14,9 +14,6 @@ License:        GPLv2+
 URL:            http://monodevelop.com/
 Source0:        http://ftp.novell.com/pub/mono/sources/%{name}/%{name}-%{version}.tar.bz2
 Patch0:         %{name}-2.1.0-unbundle-nunit.patch
-Patch1:         md-2.3-pcfile.patch
-Patch2:         md-231-monocecil.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel >= 2.4 mono-addins-devel >= 0.5 mono-nunit-devel
 BuildRequires:  mono-nunit-devel monodoc-devel
@@ -53,8 +50,6 @@ Development files for %{name}.
 %prep
 %setup -q
 %patch0 -p1 -b .unbundle-nunit
-#%patch1 -p1 -b .mono-cecil
-#%patch2 -p1 -b .monocecil
 
 sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' \
     -e 's!${exec_prefix}/lib!%{_libdir}!' configure
@@ -92,7 +87,6 @@ done
 #    sed -i 's|-r:.*Mono.Cecil.Mdb.dll|-r:%{cecilmdbdll}|' $f
 #done
 
-
 %build
 %configure --disable-update-mimedb \
            --disable-update-desktopdb
@@ -105,13 +99,10 @@ done
 #make %{?_smp_mflags}
 make
 
-
 %check
 make check
 
-
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
@@ -121,19 +112,21 @@ desktop-file-install \
 
 %find_lang %{name}
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
 update-desktop-database &> /dev/null || :
 
 %postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
 update-mime-database %{_datadir}/mime &> /dev/null || :
 update-desktop-database &> /dev/null || :
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -142,7 +135,7 @@ update-desktop-database &> /dev/null || :
 %{_libdir}/monodevelop
 %{_mandir}/man1/m*
 %{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/
+%{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/mime/packages/monodevelop.xml
 
 %files devel
@@ -150,6 +143,10 @@ update-desktop-database &> /dev/null || :
 %{_libdir}/pkgconfig/monodevelop*.pc
 
 %changelog
+* Mon Apr 04 2011 Christian Krause <chkr at fedoraproject.org> - 2.4.2-2
+- Minor spec file cleanup
+- Fix usage of scriptlets
+
 * Wed Mar 30 2011 Christian Krause <chkr at fedoraproject.org> - 2.4.2-1
 - Update to 2.4.2
 - Don't unbundle Mono.Cecil for now due to incompatible API changes


More information about the scm-commits mailing list