Accepting request 399671 from home:scarabeus_iv:branches:Base:System

- Cleanup a bit to have up-to-date spec-file
- Update url to point to some existing page with repository

OBS-URL: https://build.opensuse.org/request/show/399671
OBS-URL: https://build.opensuse.org/package/show/Base:System/pommed?expand=0&rev=15

pommed.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun  2 13:03:39 UTC 2016 - tchvatal@suse.com
+
+- Cleanup a bit to have up-to-date spec-file
+- Update url to point to some existing page with repository
+
 -------------------------------------------------------------------
 Wed Sep 12 14:28:25 UTC 2012 - alinm.elena@gmail.com
 

pommed.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package pommed
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,28 +22,7 @@ Release:        0
 Summary:        Apple laptops hotkeys event handler
 License:        GPL-2.0
 Group:          Hardware/Mobile
-Url:            http://technologeek.org/projects/pommed/
+Url:            https://launchpad.net/pommed
-%if 0
-# BuildRequires some package containing /usr/include/ofapi/of_api.h
-ExclusiveArch:  ppc
-%endif
-BuildRequires:  alsa-devel
-BuildRequires:  audiofile-devel
-BuildRequires:  libconfuse-devel
-BuildRequires:  pciutils-devel
-BuildRequires:  update-desktop-files
-BuildRequires:  xorg-x11
-BuildRequires:  xorg-x11-libX11-devel
-BuildRequires:  xorg-x11-libXext-devel
-BuildRequires:  xorg-x11-libXpm-devel
-BuildRequires:  xorg-x11-util-devel
-BuildRequires:  pkgconfig(dbus-glib-1)
-BuildRequires:  pkgconfig(gtk+-2.0)
-BuildRequires:  pkgconfig(libglade-2.0)
-ExclusiveArch:  %ix86 x86_64
-%if 0%{?suse_version} > 1020
-BuildRequires:  fdupes
-%endif
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        pommed.service
 Source2:        gpomme.desktop
@@ -57,14 +36,24 @@ Patch2:         pommed-1.38-cflags.patch
 Patch3:         pommed-1.38-hardcoded-libpci.patch
 # PATCH-FIX-UPSTREAM pommed-dbus_policy.patch ro@novell.com -- bnc#469771
 Patch4:         pommed-dbus_policy.patch
+BuildRequires:  fdupes
+BuildRequires:  pkgconfig
+BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(audiofile)
+BuildRequires:  pkgconfig(dbus-glib-1)
+BuildRequires:  pkgconfig(gtk+-2.0)
+BuildRequires:  pkgconfig(libconfuse)
+BuildRequires:  pkgconfig(libglade-2.0)
+BuildRequires:  pkgconfig(libpci)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(x11-xcb)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xpm)
 Requires:       eject
-Requires:       xorg-x11
+Requires(post): update-desktop-files
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%systemd_requires
+ExclusiveArch:  %ix86 x86_64
-Requires(pre): systemd
+%{?systemd_requires}
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
 
 %description
 pommed handles the hotkeys found on the Apple MacBook Pro, MacBook and
@@ -123,10 +112,8 @@ mkdir -p %{buildroot}/%{_mandir}/man1 %{buildroot}/%{_datadir}/kde4/config
 install -m 755 pommed/pommed          %{buildroot}/%{_sbindir}
 install -m 644 dbus-policy.conf   %{buildroot}/%{_sysconfdir}/dbus-1/system.d/pommed.conf
 install -m 644 %{SOURCE5}    %{buildroot}/%{_sysconfdir}/pommed.conf
-install -m 644 %{SOURCE1}      %{buildroot}%_unitdir/pommed.service
+install -m 644 %{SOURCE1}      %{buildroot}%{_unitdir}/pommed.service
-pushd %{buildroot}%_unitdir/multi-user.target.wants/
+ln -s service %{buildroot}/%{_sbindir}/rcpommed
-ln -s ../pommed.service
-popd
 install -m 644 pommed.1               %{buildroot}/%{_mandir}/man1
 # gpomme
 install -m 755 gpomme/gpomme          %{buildroot}/%{_bindir}
@@ -154,14 +141,9 @@ mkdir -p %{buildroot}/%{_sysconfdir}/pommed
 install -m 644 icons/gpomme_32x32.xpm %{buildroot}/%{_datadir}/icons/wmpomme.xpm
 install -m 644 icons/gpomme_32x32.xpm %{buildroot}/%{_datadir}/pixmaps/gpomme.xpm
 
-%if 0%{?suse_version} > 1020
 %fdupes -s %{buildroot}
-%endif
 %find_lang gpomme
 
-%clean
-rm -rf %{buildroot}
-
 %pre
 %service_add_pre %{name}.service
 
@@ -174,15 +156,29 @@ rm -rf %{buildroot}
 %postun
 %service_del_postun %{name}.service
 
+%post -n gpomme
+%desktop_database_post
+%icon_theme_cache_post
+
+%postun -n gpomme
+%icon_theme_cache_postun
+%desktop_database_postun
+
+%post -n wmpomme
+%icon_theme_cache_post
+
+%postun -n wmpomme
+%icon_theme_cache_postun
+
 %files
 %defattr(-,root,root)
-%doc AUTHORS README TODO
+%doc AUTHORS README TODO COPYING
 %config(noreplace) %{_sysconfdir}/pommed.conf
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/pommed.conf
 %{_sbindir}/pommed
+%{_sbindir}/rcpommed
 %{_mandir}/man1/po*
 %{_unitdir}/%{name}.service
-%{_unitdir}/multi-user.target.wants/%{name}.service
 
 %files -n gpomme -f gpomme.lang
 %defattr(-,root,root)