Accepting request 80164 from KDE:Distro:Factory

few fixes for RPMLINT warnings and clean up the specfile formatting (forwarded request 80159 from mlin7442)

OBS-URL: https://build.opensuse.org/request/show/80164
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rsibreak?expand=0&rev=20
This commit is contained in:
Sascha Peilicke 2011-08-31 08:59:18 +00:00 committed by Git OBS Bridge
parent bb212faa2b
commit a99f5c7952
2 changed files with 50 additions and 43 deletions

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Aug 29 09:59:19 UTC 2011 - mlin@suse.com
- few fixes for RPMLINT warnings
* translated desktop files
* do not obsoletes itself
* add %fdupes macro for fix files duplicated
- clean up the specfile formatting
-------------------------------------------------------------------
Sat Jan 15 08:46:12 UTC 2011 - wstephenson@novell.com

View File

@ -19,18 +19,19 @@
Name: rsibreak
BuildRequires: kdebase4-workspace-devel
License: GPLv2+
Url: http://www.kde-apps.org/content/show.php?content=29725
Group: Productivity/Other
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Assists in the Recovery and Prevention of Repetitive Strain Injury
Version: 0.11
Release: 1
License: GPLv2+
Summary: Assists in the Recovery and Prevention of Repetitive Strain Injury
Url: http://www.kde-apps.org/content/show.php?content=29725
Group: Productivity/Other
%define tar_version 0.11
Source: rsibreak-%tar_version.tar.bz2
Provides: kde4-rsibreak = 0.9.0
Obsoletes: kde4-rsibreak <= 0.9.0
Source: rsibreak-%{tar_version}.tar.bz2
BuildRequires: kdebase4-workspace-devel
BuildRequires: fdupes
Provides: kde4-rsibreak = %{version}
Obsoletes: kde4-rsibreak < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires
%description
@ -38,15 +39,8 @@ Repetitive Strain Injury is an illness which can occur as a result of
working with a mouse and keyboard. This utility can be used to remind
you to take a break now and then.
Authors:
--------
Tom Albers <tomalbers@kde.nl>
Bram Schoenmakers <bramschoenmakers@kde.nl>
%prep
%setup -n rsibreak-%tar_version -q
%setup -n rsibreak-%{tar_version} -q
%build
%cmake_kde4 -d build
@ -54,46 +48,50 @@ Authors:
%install
cd build
%makeinstall
%make_install
cd ..
%suse_update_desktop_file -G "RSI Prevention" rsibreak TimeUtility
%find_lang %name --all-name
%if %suse_version < 1120
%find_lang %{name} --all-name
%if 0%{?suse_version} < 1120
# work-around bnc#457908
for i in es et fr nl pt sv uk; do mkdir $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/$i/common;done
for i in es et fr nl pt sv uk; do mkdir %{buildroot}%{_datadir}/doc/kde/HTML/$i/common;done
%endif
%suse_update_desktop_file -G "RSI Prevention" rsibreak TimeUtility
%suse_update_desktop_file %{buildroot}%{_kde4_servicesdir}/plasma-applet-rsibreak.desktop
%suse_update_desktop_file %{buildroot}%{_kde4_servicesdir}/plasma-engine-rsibreak.desktop
%suse_update_desktop_file %{buildroot}%{_datadir}/autostart/rsibreak.desktop
%fdupes -s %{buildroot}%{_datadir}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -rf $RPM_BUILD_ROOT
rm -rf %{buildroot}
%files -f %name.lang
%files -f %{name}.lang
%defattr(-,root,root)
%doc AUTHORS ChangeLog COPYING
%doc %lang(en) /usr/share/doc/kde/HTML/en/rsibreak
%doc %lang(en) %{_datadir}/doc/kde/HTML/en/rsibreak
%_kde_share_dir/apps/rsibreak
/usr/bin/rsibreak
/usr/share/applications/kde4/rsibreak.desktop
/usr/share/dbus-1/interfaces/org.rsibreak.rsiwidget.xml
/usr/share/icons/hicolor/*/actions/*
/usr/share/icons/hicolor/*x*/actions/rsibreak*.png
/usr/share/icons/hicolor/*x*/apps/rsibreak.png
/usr/share/autostart/rsibreak.desktop
/usr/%_lib/kde4/plasma_applet_rsibreak.so
/usr/%_lib/kde4/plasma_engine_rsibreak.so
/usr/share/kde4/apps/desktoptheme/default/widgets/rsibreak.svg
/usr/share/kde4/services/plasma-applet-rsibreak.desktop
/usr/share/kde4/services/plasma-engine-rsibreak.desktop
%if %suse_version < 1120
%{_bindir}/rsibreak
%{_datadir}/applications/kde4/rsibreak.desktop
%{_datadir}/dbus-1/interfaces/org.rsibreak.rsiwidget.xml
%{_datadir}/icons/hicolor/*/actions/*
%{_datadir}/icons/hicolor/*x*/actions/rsibreak*.png
%{_datadir}/icons/hicolor/*x*/apps/rsibreak.png
%{_datadir}/autostart/rsibreak.desktop
%{_libdir}/kde4/plasma_applet_rsibreak.so
%{_libdir}/kde4/plasma_engine_rsibreak.so
%{_datadir}/kde4/apps/desktoptheme/default/widgets/rsibreak.svg
%{_datadir}/kde4/services/plasma-applet-rsibreak.desktop
%{_datadir}/kde4/services/plasma-engine-rsibreak.desktop
%if 0%{?suse_version} < 1120
# work-around bnc#457911
%dir /usr/share/doc/kde/HTML/*
%dir %{_datadir}/doc/kde/HTML/*
%endif
%if %suse_version < 1120
%dir /usr/share/locale/hne
%dir /usr/share/locale/hne/LC_MESSAGES
%if 0%{?suse_version} < 1120
%dir %{_datadir}/locale/hne
%dir %{_datadir}/locale/hne/LC_MESSAGES
%endif
%changelog