SPECS: kaspaliste.spec - kill obsolete kde_* redefinitions - use _...

[darekr]

Author: darekr                       Date: Fri Dec 23 16:21:42 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- kill obsolete kde_* redefinitions
- use _desktopdir, added 'Categories'
- BR: 1.129 macros for _kdedocdir, pass CXX
- rel. 0.2

---- Files affected:
SPECS:
   kaspaliste.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/kaspaliste.spec
diff -u SPECS/kaspaliste.spec:1.4 SPECS/kaspaliste.spec:1.5
--- SPECS/kaspaliste.spec:1.4	Mon Sep  6 22:59:53 2004
+++ SPECS/kaspaliste.spec	Fri Dec 23 17:21:36 2005
@@ -3,7 +3,7 @@
 Summary(pl):	Baza danych literatury
 Name:		kaspaliste
 Version:	0.96
-Release:	0.1
+Release:	0.2
 License:	GPL
 Group:		X11/Applications
 Source0:	http://dl.sourceforge.net/kaspaliste/%{name}-%{version}.tar.gz
@@ -12,10 +12,9 @@
 URL:		http://kaspaliste.sourceforge.net/
 BuildRequires:	kdelibs-devel
 BuildRequires:	postgresql-devel
+BuildRequires:	rpmbuild(macros) >= 1.129
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define         _htmldir        /usr/share/doc/kde/HTML
-
 %description
 Kaspaliste is a literature database. It handles all kinds of books,
 articles, journals, webpages etc. But the database goes far beyond
@@ -36,16 +35,17 @@
 %patch -p1
 
 %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
 
 %configure2_13 \
 	--%{!?debug:dis}%{?debug:en}able-debug \
 	--disable-rpath \
 	--with-pg-libs=/usr/lib
 
-%{__make}
+%{__make} \
+	CXX="%{__cxx}"
+
+echo 'Categories=Office' >> $RPM_BUILD_ROOT%{_desktopdir}/kde/%{name}.desktop
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -53,6 +53,11 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+install -d $RPM_BUILD_ROOT%{_desktopdir}/kde
+
+mv $RPM_BUILD_ROOT%{_datadir}/applnk/Applications/%{name}.desktop \
+   $RPM_BUILD_ROOT%{_desktopdir}/kde
+
 %find_lang %{name} --with-kde
 
 %clean
@@ -62,10 +67,10 @@
 %defattr(644,root,root,755)
 %doc README ChangeLog TODO data/create.tables.sql
 %attr(755,root,root) %{_bindir}/*
-%{_applnkdir}/Applications/*
+%{_desktopdir}/kde/*.desktop
 %{_datadir}/apps/kaspaliste
 %{_datadir}/config/kaspalisterc
-%{_pixmapsdir}/[!l]*/*/*/*
+%{_iconsdir}/hicolor/*/apps/*.png
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -73,6 +78,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2005/12/23 16:21:36  darekr
+- kill obsolete kde_* redefinitions
+- use _desktopdir, added 'Categories'
+- BR: 1.129 macros for _kdedocdir, pass CXX
+- rel. 0.2
+
 Revision 1.4  2004/09/06 20:59:53  blues
 - 0.96 - needs fixes
 
================================================================

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