SPECS: konserve.spec - removed outdated kde_* redefinitions - fix ...

[darekr]

Author: darekr                       Date: Mon Mar 26 22:45:25 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- removed outdated kde_* redefinitions
- fix desktop file's location

---- Files affected:
SPECS:
   konserve.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/konserve.spec
diff -u SPECS/konserve.spec:1.7 SPECS/konserve.spec:1.8
--- SPECS/konserve.spec:1.7	Tue Feb 13 07:46:49 2007
+++ SPECS/konserve.spec	Tue Mar 27 00:45:20 2007
@@ -11,10 +11,9 @@
 URL:		http://konserve.sourceforge.net/
 BuildRequires:	kdelibs-devel
 BuildRequires:	qt-devel
+BuildRequires:	rpmbuild(macros) >= 1.129
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define         _htmldir        /usr/share/doc/kde/HTML
-
 %description
 Konserve is a small backup application for the KDE 3.x environment.
 
@@ -26,8 +25,7 @@
 %setup -q
 
 %build
-kde_appsdir="%{_desktopdir}"; export kde_appsdir
-kde_htmldir="%{_htmldir}"; export kde_htmldir
+kde_htmldir="%{_kdedocdir}"; export kde_htmldir
 %configure
 
 %{__make}
@@ -40,7 +38,7 @@
 
 install -d $RPM_BUILD_ROOT%{_desktopdir}/kde
 
-mv $RPM_BUILD_ROOT%{_desktopdir}/Applications/konserve.desktop \
+mv $RPM_BUILD_ROOT%{_datadir}/applnk/Applications/konserve.desktop \
         $RPM_BUILD_ROOT%{_desktopdir}/kde
 
 echo "Categories=Qt;KDE;System;" >> \
@@ -56,8 +54,8 @@
 %doc AUTHORS ChangeLog README TODO
 %attr(755,root,root) %{_bindir}/konserve
 %{_datadir}/apps/*
-%{_iconsdir}/*/*/*/*
-%{_desktopdir}/*.desktop
+%{_iconsdir}/hicolor/*/apps/konserve.png
+%{_desktopdir}/kde/*.desktop
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -65,6 +63,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2007/03/26 22:45:20  darekr
+- removed outdated kde_* redefinitions
+- fix desktop file's location
+
 Revision 1.7  2007/02/13 06:46:49  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/konserve.spec?r1=1.7&r2=1.8&f=u