[emelfm2] Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

Christoph Wickert cwickert at fedoraproject.org
Thu Aug 8 21:38:13 UTC 2013


commit 4c64766a9d63eaffcd824916fb3dd00499876f43
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Thu Aug 8 23:38:05 2013 +0200

    Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
    
    - Install docs unversioned on Fedora >= 20 (#992210)
    - Make desktop vendor conditional

 emelfm2.spec |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)
---
diff --git a/emelfm2.spec b/emelfm2.spec
index 9c1c95f..6a9fbc9 100644
--- a/emelfm2.spec
+++ b/emelfm2.spec
@@ -49,7 +49,9 @@ make %{?_smp_mflags} \
     DOC_DIR=%{_docdir}/%{name} \
     XDG_DESKTOP_DIR=%{_datadir}/applications \
     XDG_APPLICATION_DIR=%{_datadir}/application-registry \
-    DOCS_VERSION=1 \
+    %if (0%{?fedora} && 0%{?fedora} < 20) || (0%{?rhel} && 0%{?rhel} < 7)
+        DOCS_VERSION=1 \
+    %endif
     WITH_TRANSPARENCY=1 \
     WITH_KERNELFAM=1 \
     USE_INOTIFY=1 \
@@ -75,7 +77,9 @@ make %{?_smp_mflags} \
 
 %install
 make install install_i18n \
-    DOCS_VERSION=1 \
+    %if (0%{?fedora} && 0%{?fedora} < 20) || (0%{?rhel} && 0%{?rhel} < 7)
+        DOCS_VERSION=1 \
+    %endif
     PREFIX=%{buildroot}%{_prefix} \
     BIN_DIR=%{buildroot}%{_bindir} \
     LIB_DIR=%{buildroot}%{_libdir} \
@@ -87,8 +91,11 @@ make install install_i18n \
 %find_lang %{name}
 
 desktop-file-install  \
-        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+    %if (0%{?fedora} && 0%{?fedora} < 19)
+        --vendor fedora
+    %endif
+    --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
+    ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 rm -f ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/INSTALL
 
@@ -98,15 +105,17 @@ rm -f ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/INSTALL
 %doc docs/GPL docs/LGPL
 %{_bindir}/%{name}
 %{_libdir}/%{name}/
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/*%{name}.desktop
 %{_datadir}/application-registry/%{name}.applications
 %{_datadir}/pixmaps/%{name}
 %{_mandir}/man1/emelfm2.1.gz
 
 
 %changelog
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.2-4
+* Wed Aug 07 2013 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+- Install docs unversioned on Fedora >= 20 (#992210)
+- Make desktop vendor conditional
 
 * Mon Mar 04 2013 Rahul Sundaram <sundaram at fedoraproject.org> - 0.8.2-3
 - remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
@@ -249,7 +258,7 @@ rm -f ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/INSTALL
 * Sun Aug 06 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.8-1
 - Update to 0.1.8.
 
-* Thu Apr 23 2006 Christoph Wickert <fedora wickert arcor de> - 0.1.7-1
+* Thu Apr 20 2006 Christoph Wickert <fedora wickert arcor de> - 0.1.7-1
 - Update to 0.1.7.
 
 * Tue Mar 14 2006 Christoph Wickert <fedora wickert arcor de> - 0.1.6-1


More information about the scm-commits mailing list