Accepting request 86795 from KDE:Distro:Factory

forward to factory

OBS-URL: https://build.opensuse.org/request/show/86795
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=17
This commit is contained in:
Ruediger Oertel 2011-10-06 14:36:35 +00:00 committed by Git OBS Bridge
parent 9c70b59108
commit f26578dd79
2 changed files with 33 additions and 45 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Sep 17 21:04:19 UTC 2011 - toddrme2178@gmail.com
- Removed checks for obsolete openSUSE versions (fix for RPMLINT warnings)
- Added check for duplicate files (fix for RPMLINT warning)
- Cleaned up spec file formatting
-------------------------------------------------------------------
Tue Aug 10 09:34:13 UTC 2010 - beineri@opensuse.org

View File

@ -15,27 +15,20 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: kdiff3
BuildRequires: kdebase4-workspace-devel libkonq-devel
%if %suse_version < 1010
BuildRequires: update-desktop-files
%endif
%if %suse_version > 1020
BuildRequires: fdupes
%endif
License: GPLv2+
Url: http://kdiff3.sourceforge.net/
Group: Development/Tools/Version Control
Summary: Feature-Rich Code Comparison Utility
Version: 0.9.95
Release: 10
BuildRoot: %{_tmppath}/%{name}-%{version}-build
License: GPLv2+
Summary: Feature-Rich Code Comparison Utility
Url: http://kdiff3.sourceforge.net/
Group: Development/Tools/Version Control
Source0: %{name}-%{version}.tar.bz2
BuildRequires: fdupes
BuildRequires: kdebase4-workspace-devel
BuildRequires: libkonq-devel
Recommends: %{name}-lang = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires
Requires: %{name}-lang = %{version}
%description
KDiff3 is a program that:
@ -51,12 +44,6 @@ KDiff3 is a program that:
* Has an intuitive graphical user interface
Authors:
--------
Joachim Eibl <joachim.eibl@gmx.de>
%lang_package
%prep
%setup -q
@ -67,34 +54,28 @@ Authors:
%install
pushd build
%makeinstall
%make_install
popd
%suse_update_desktop_file -r kdiff3 Qt KDE Utility TextEditor X-KDE-Utilities-File
%kde_post_install
%find_lang %{name} %{name}.lang
%find_lang kdiff3plugin %{name}.lang
%find_lang desktop_extragear-utils_kdiff3 %{name}.lang
rm $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/*/kdiff3/common
%suse_update_desktop_file -r kdiff3 Qt KDE Utility TextEditor X-KDE-Utilities-File
%kde_post_install
%find_lang %{name} %{name}.lang
%find_lang kdiff3plugin %{name}.lang
%find_lang desktop_extragear-utils_kdiff3 %{name}.lang
rm %{buildroot}%{_kde4_htmldir}/*/kdiff3/common
%fdupes -s %{buildroot}
%files
%defattr(-,root,root)
%doc COPYING
%if %suse_version < 1120
%dir /usr/share/locale/hne
%dir /usr/share/locale/hne/LC_MESSAGES
%endif
/usr/bin/kdiff3
%_kde4_modules/libkdiff3part.so
%_kde4_modules/libkdiff3plugin.so
%_datadir/applications/kde4/kdiff3.desktop
%_datadir/icons/hicolor/*/apps/kdiff3.png
%_datadir/icons/locolor/*/apps/kdiff3.png
%_datadir/kde4/apps/kdiff3/kdiff3_shell.rc
%_datadir/kde4/apps/kdiff3/kdiff3_part.rc
%_datadir/kde4/services/kdiff3part.desktop
%_datadir/kde4/services/kdiff3_plugin.desktop
%_datadir/kde4/apps/kdiff3
%{_kde4_applicationsdir}/kdiff3.desktop
%{_kde4_appsdir}/kdiff3/
%{_kde4_bindir}/kdiff3
%{_kde4_iconsdir}/??color/*/apps/kdiff3.png
%{_kde4_modulesdir}/libkdiff3part.so
%{_kde4_modulesdir}/libkdiff3plugin.so
%{_kde4_servicesdir}/kdiff3part.desktop
%{_kde4_servicesdir}/kdiff3_plugin.desktop
%files lang -f %name.lang
%files lang -f %{name}.lang
%changelog