SPECS: kroneko.spec - removed obsoleted kde_* redefinition - macro...

darekr darekr at pld-linux.org
Sun Jan 21 18:51:20 CET 2007


Author: darekr                       Date: Sun Jan 21 17:51:20 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- removed obsoleted kde_* redefinition
- macros 1.129 for _kdedocdir
- kill _applnkdir - use _desktopdir; use iconsdir
- rel. 2

---- Files affected:
SPECS:
   kroneko.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/kroneko.spec
diff -u SPECS/kroneko.spec:1.3 SPECS/kroneko.spec:1.4
--- SPECS/kroneko.spec:1.3	Mon Aug 25 21:13:30 2003
+++ SPECS/kroneko.spec	Sun Jan 21 18:51:15 2007
@@ -3,7 +3,7 @@
 Summary(pl):	Narzędzie KDE3 ułatwiające konfigurację crona i anacrona
 Name:		kroneko
 Version:	0.3.19
-Release:	1
+Release:	2
 License:	GPL
 Group:		X11/Applications
 Source0:	http://kyushu-u.dl.sourceforge.jp/kroneko/5642/%{name}-%{version}.tar.gz
@@ -11,10 +11,9 @@
 URL:		http://www.kroneko.bounceme.net/kroneko/eng/
 BuildRequires:	fam-devel
 BuildRequires:	kdelibs-devel >= 3.1
+BuildRequires:	rpmbuild(macros) >= 1.129
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_htmldir	/usr/share/doc/kde/HTML
-
 %description
 Kroneko is a KDE3 tool for configuring cron and anacron.
 
@@ -26,21 +25,21 @@
 %setup -q
 
 %build
-kde_appsdir="%{_applnkdir}"; export kde_appsdir
-kde_htmldir="%{_htmldir}"; export kde_htmldir
-kde_icondir="%{_pixmapsdir}"; export kde_icondir
+kde_htmldir="%{_kdedocdir}"; export kde_htmldir
 %configure
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_desktopdir}/kde
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_applnkdir}/Utilities
-mv $RPM_BUILD_ROOT%{_applnkdir}/{Applications,Utilities}/kroneko.desktop
+mv -f $RPM_BUILD_ROOT%{_datadir}/applnk/Applications/*.desktop \
+	$RPM_BUILD_ROOT%{_desktopdir}/kde
 
 %find_lang %{name} --with-kde
 
@@ -50,9 +49,9 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
-%{_applnkdir}/Utilities/*
+%{_desktopdir}/kde/*.desktop
 %{_datadir}/apps/*
-%{_pixmapsdir}/*/*/*/*
+%{_iconsdir}/hicolor/*/apps/*.png
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -60,6 +59,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2007/01/21 17:51:15  darekr
+- removed obsoleted kde_* redefinition
+- macros 1.129 for _kdedocdir
+- kill _applnkdir - use _desktopdir; use iconsdir
+- rel. 2
+
 Revision 1.3  2003/08/25 19:13:30  ankry
 - typo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kroneko.spec?r1=1.3&r2=1.4&f=u



More information about the pld-cvs-commit mailing list