[emelfm2] remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247

[Christoph Wickert]

Am Dienstag, den 05.03.2013, 03:56 +0000 schrieb Rahul Sundaram:
> commit 0ed4b2cddfa74be4b66b3646aee4c5d0e3fe756f
> Author: Rahul Sundaram <sundaram at fedoraproject.org>
> Date:   Mon Mar 4 22:55:58 2013 -0500
> 
>     remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
>     
>     - drop obsolete conditionals and version requirements
>     - drop INSTALL file
>     - clean up spec to follow current guidelines


Hi Rahul,

if you want to help out in the effort to remove the vendor tags, please
do it *right*. That means:
      * use conditionals, so maintainers can continue to use one spec
        for F19 and other releases. Toshio provided examples at
        https://fedoraproject.org/wiki/User:Toshio/Devendorize_desktop_files
      * Don't rewrite spec files for no reason. There was no reason to
        break compatibility with older releases such as el5.
      * Don't use "current guidelines" to justify our changes.
        Everything you changed were "may" or "should" items, but our
        guidelines nowhere say that one *must not* have backwards
        compatibility.

While I appreciate your efforts to help out in the de-vendorization, I
think the way *how* you did it is counterproductive and causes more work
for maintainers.

As I am currently very busy with my dayjob, I'd like to ask you to
please fix all of my packages you changed to use conditionals, so I can
continue to use one spec at least for all supported Fedora releases.

Kind regards,
Christoph

> 
>  emelfm2.spec |   64 ++++++++++++++-------------------------------------------
>  1 files changed, 16 insertions(+), 48 deletions(-)
> ---
> diff --git a/emelfm2.spec b/emelfm2.spec
> index d0898ec..39a3a9c 100644
> --- a/emelfm2.spec
> +++ b/emelfm2.spec
> @@ -1,11 +1,6 @@
> -## Rebuild options:
> -# --with hal : Build with hal support (default: without)
> -#              use bcond_without to change the default
> -%bcond_with hal
> -
>  Name:           emelfm2
>  Version:        0.8.2
> -Release:        2%{?dist}
> +Release:        3%{?dist}
>  Summary:        File manager that implements the popular two-pane design
>  
>  Group:          Applications/File
> @@ -14,36 +9,18 @@ URL:            http://emelfm2.net/
>  Source0:        http://emelfm2.net/rel/%{name}-%{version}.tar.bz2
>  #VCS svn:http://svn.emelfm2.net/trunk/
>  Patch0:         emelfm2-0.7.1-dsofix.patch
> -BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>  
>  BuildRequires:  dbus-glib-devel
>  BuildRequires:  file-devel
> -BuildRequires:  gtk2-devel >= 2.6.0
> +BuildRequires:  gtk2-devel
>  BuildRequires:  libacl-devel
>  BuildRequires:  gettext
>  BuildRequires:  desktop-file-utils
>  Requires:       findutils >= 4.2, grep, sed, bzip2
> -%if %{with hal}
> -BuildRequires:  hal-devel, dbus-glib-devel
> -Requires:       hal
> -%endif
> -
> -# only available in Fedora >= 11
> -%if 0%{?fedora} > 10
> -BuildRequires:  gtkspell-devel >= 2.0.14
> -%endif
> -
> -# Fedora 13 uses udisks
> -%if 0%{?fedora} > 12  || 0%{?rhel} > 6
> +BuildRequires:  gtkspell-devel
>  BuildRequires:  udisks-devel
>  Requires:       udisks
> -%else
> -# Fedora 11 uses DeviceKit
> -%if 0%{?fedora} > 10
> -BuildRequires:  DeviceKit-disks-devel
> -Requires:       DeviceKit-disks
> -%endif
> -%endif
> +
>  
>  %description
>  emelFM2 is the GTK+2 port of emelFM. emelFM2 is a file manager that implements 
> @@ -76,24 +53,15 @@ make %{?_smp_mflags} \
>      WITH_TRANSPARENCY=1 \
>      WITH_KERNELFAM=1 \
>      USE_INOTIFY=1 \
> -    %if 0%{?fedora} > 10 || 0%{?rhel} > 6
> -      EDITOR_SPELLCHECK=1 \
> -    %endif
> +    EDITOR_SPELLCHECK=1 \
>      WITH_OUTPUTSTYLES=1 \
>      WITH_CUSTOMMOUSE=1 \
>      WITH_GTK2=1 \
>      NEW_COMMAND=1 \
> -    %if 0%{?fedora} > 11 || 0%{?rhel} > 6
> -      WITH_UDISKS=1 \
> -    %endif
> -    %if %{with hal}
> -      WITH_HAL=1 \
> -    %endif
> +    WITH_UDISKS=1 \
>      WITH_TRACKER=1 \
>      WITH_ACL=1 \
> -    %if 0%{?fedora} > 11 || 0%{?rhel} > 6
> -      WITH_POLKIT=1 \
> -    %endif
> +    WITH_POLKIT=1 \
>      PREFIX=%{_prefix} \
>      BIN_DIR=%{_bindir} \
>      LIB_DIR=%{_libdir} \
> @@ -106,7 +74,6 @@ make %{?_smp_mflags} \
>  
> 
>  %install
> -rm -rf %{buildroot}
>  make install install_i18n \
>      DOCS_VERSION=1 \
>      PREFIX=%{buildroot}%{_prefix} \
> @@ -119,30 +86,31 @@ make install install_i18n \
>  
>  %find_lang %{name}
>  
> -desktop-file-install --vendor fedora                            \
> +desktop-file-install  \
>          --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
> -        --delete-original                                       \
>          ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
>  
> -
> -%clean
> -rm -rf %{buildroot}
> -
> +rm -f ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/INSTALL
>  
>  %files -f %{name}.lang
> -%defattr(-,root,root,-)
>  %doc docs/ACTIONS docs/CONFIGURATION docs/CREDITS docs/HACKING 
>  %doc docs/NEWS docs/README docs/TODO docs/USAGE docs/WARNING 
>  %doc docs/GPL docs/LGPL
>  %{_bindir}/%{name}
>  %{_libdir}/%{name}/
> -%{_datadir}/applications/fedora-%{name}.desktop
> +%{_datadir}/applications/%{name}.desktop
>  %{_datadir}/application-registry/%{name}.applications
>  %{_datadir}/pixmaps/%{name}
>  %{_mandir}/man1/emelfm2.1.gz
>  
> 
>  %changelog
> +* 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
> +- drop obsolete conditionals and version requirements
> +- drop INSTALL file
> +- clean up spec to follow current guidelines
> +
>  * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.2-2
>  - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
>