[eiciel] General cleanup of spec file and remove obsolete items. Insert %prep guard to check whether ChangeLo

[Michael Schwendt]

commit 682b5c5beed34fed62a0165443117b90403d3fcf
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Mon Nov 7 13:38:19 2011 +0100

    General cleanup of spec file and remove obsolete items.
    Insert %prep guard to check whether ChangeLog file gets replaced.
    Fix desktop file issues.

 ...tch => eiciel-0.9.8-fedora_sys_usergroups.patch |    0
 eiciel-0.9.8.1-desktop-file.patch                  |   16 ++++
 eiciel.spec                                        |   82 +++++++++-----------
 3 files changed, 54 insertions(+), 44 deletions(-)
---
diff --git a/fedora_sys_usergroups.patch b/eiciel-0.9.8-fedora_sys_usergroups.patch
similarity index 100%
rename from fedora_sys_usergroups.patch
rename to eiciel-0.9.8-fedora_sys_usergroups.patch
diff --git a/eiciel-0.9.8.1-desktop-file.patch b/eiciel-0.9.8.1-desktop-file.patch
new file mode 100644
index 0000000..161c517
--- /dev/null
+++ b/eiciel-0.9.8.1-desktop-file.patch
@@ -0,0 +1,16 @@
+diff -Nur eiciel-0.9.8.1-orig/src/eiciel.desktop.in eiciel-0.9.8.1/src/eiciel.desktop.in
+--- eiciel-0.9.8.1-orig/src/eiciel.desktop.in	2007-10-12 17:06:28.000000000 +0200
++++ eiciel-0.9.8.1/src/eiciel.desktop.in	2011-11-07 13:25:41.742876683 +0100
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=Eiciel
+ GenericName=Access control list editor
+ GenericName[ca]=Editor de llistes de control d'accés
+@@ -11,5 +10,4 @@
+ Icon=@DSK_pkgdatadir@/img/icon_eiciel_24.png
+ Terminal=false
+ Type=Application
+-Categories=GNOME;System;FileTools;
+-Version=@DSK_VERSION@
++Categories=GNOME;GTK;System;FileTools;
diff --git a/eiciel.spec b/eiciel.spec
index 7609b1f..e4241f7 100644
--- a/eiciel.spec
+++ b/eiciel.spec
@@ -1,24 +1,28 @@
-Name:           eiciel
-Version:        0.9.8.1
-Release:        2%{?dist}
-Summary:        Graphical access control list (ACL) editor
-Group:          Applications/System
-License:        GPLv2+
-URL:            http://rofi.roger-ferrer.org/eiciel
-Source0:        http://rofi.roger-ferrer.org/eiciel/download/eiciel-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+Name: eiciel
+Version: 0.9.8.1
+Release: 3%{?dist}
+Summary: Graphical editor for ACLs and xattr
+Group: Applications/System
+License: GPLv2+
+URL: http://rofi.roger-ferrer.org/eiciel
+Source0: http://rofi.roger-ferrer.org/eiciel/download/eiciel-%{version}.tar.bz2
+
+# Fedora <= 15 only
 # change system user/groups upper bound from 500 to 1000.  Works for fedora;
 # anyone wishing to submit a "real" patch that involves querying libuser
 # directly is MORE than welcome to do so :)
-Patch0:		fedora_sys_usergroups.patch
+Patch0: eiciel-0.9.8-fedora_sys_usergroups.patch
 # move LDFLAGS before libs, add -Wl,--as-needed
 # this only touches Makefile.in for now
 Patch1: eiciel-0.9.8.1-LDFLAGS.patch
+#
+Patch2: eiciel-0.9.8.1-desktop-file.patch
 
-BuildRequires:  libgnomeui-devel libacl-devel nautilus-devel
-BuildRequires:  gtkmm30-devel
-BuildRequires:  desktop-file-utils
+BuildRequires: libgnomeui-devel
+BuildRequires: libacl-devel
+BuildRequires: nautilus-devel
+BuildRequires: gtkmm30-devel
+BuildRequires: desktop-file-utils
 
 %define ext_dir %(eval "pkg-config --variable=extensiondir libnautilus-extension")
 
@@ -29,70 +33,60 @@ BuildRequires:  desktop-file-utils
 }
 
 %description
-Graphical editor for access control lists (ACL)
-and extended attributes (XATTR), either as an
-extension within Nautilus, or as a standalone utility.
+Graphical editor for access control lists (ACLs) and extended attributes
+(xattr), either as an extension within Nautilus, or as a standalone
+utility.
 
 
 %prep
 %setup -q
+[ $(cksum ChangeLog|cut -d ' ' -f 1,2) != "874165526 318" ] && exit -1
 %if 0%{?fedora} < 16
 %patch0 -b .uid_gid_range
 %endif
 %patch1 -p1 -b .LDFLAGS
+%patch2 -p1 -b .desktop-file
 
 iconv -f ISO-8859-1 -t UTF-8 AUTHORS > foo
 mv foo AUTHORS
 
-perl -pi -e 's|/home/roger/eiciel/eiciel_0_9_5/install|/usr|' src/%{name}.desktop.in
-
-sed -i '/^Version.*$/d' src/%{name}.desktop.in
 
 %build
-%configure --with-nautilus-extensions-dir=%{ext_dir}
+%configure --with-nautilus-extensions-dir=%{ext_dir} \
+    --disable-static
 make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
-
 make install DESTDIR=%{buildroot}
-
 %find_lang %{name}
 
+rm -f %{buildroot}%{ext_dir}/*.la
+
 desktop-file-install --vendor fedora                        \
         --dir %{buildroot}%{_datadir}/applications          \
-        --add-category X-Fedora                             \
         --delete-original                                   \
         %{buildroot}%{_datadir}/applications/%{name}.desktop
 
-# less is more
-#cd %{buildroot}%{_datadir}/%{name}/doc/C/figures
-#for img in `ls *.png` ; do
-#    if [ -e ../../../img/$img ] ; then
-#        rm $img
-#        ln -s ../../../img/$img
-#    fi
-#done
-
-%clean
-rm -rf %{buildroot}
-
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS COPYING README
+# ancient gettextize file
+#%doc ChangeLog
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
-%{_datadir}/gnome/help/%{name}
-%{_datadir}/applications/*%{name}*
+%{_datadir}/gnome/help/%{name}/
+%{_datadir}/applications/*%{name}.desktop
 %{_mandir}/man1/%{name}*
-%{ext_dir}/lib%{name}*
-%exclude %{ext_dir}/*.a
-%exclude %{ext_dir}/*.la
+%{ext_dir}/lib%{name}*.so
 
 
 %changelog
+* Mon Nov  7 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 0.9.8.1-3
+- General cleanup of spec file and remove obsolete items.
+- Insert %%prep guard to check whether ChangeLog file gets replaced.
+- Fix desktop file issues.
+
 * Sat Nov  5 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 0.9.8.1-2
 - Move LDFLAGS before libs and link with --as-needed.