Author: qboosh Date: Sun Jun 11 18:48:29 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- fixed desktop dir, BR: automake,rpmbuild(macros) for kdedocdir
---- Files affected:
SPECS:
klogic.spec (1.6 -> 1.7)
---- Diffs:
================================================================
Index: SPECS/klogic.spec
diff -u SPECS/klogic.spec:1.6 SPECS/klogic.spec:1.7
--- SPECS/klogic.spec:1.6 Sun Jun 11 19:59:42 2006
+++ SPECS/klogic.spec Sun Jun 11 20:48:24 2006
@@ -11,7 +11,9 @@
Source1: %{name}.desktop
URL: http://www.a-rostin.de/klogic/
BuildRequires: artsc-devel
+BuildRequires: automake
BuildRequires: kdelibs-devel
+BuildRequires: rpmbuild(macros) >= 1.129
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _noautocompressdoc *.circuit
@@ -34,7 +36,6 @@
%build
cp -f /usr/share/automake/config.sub admin
-kde_appsdir="%{_desktopdir}/kde"; export kde_appsdir
kde_htmldir="%{_kdedocdir}"; export kde_htmldir
kde_icondir="%{_pixmapsdir}"; export kde_icondir
@@ -51,9 +52,9 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT/%{_pixmapsdir}/klogic/* $RPM_BUILD_ROOT/%{_pixmapsdir}/
-install -d $RPM_BUILD_ROOT/%{_desktopdir}/Edutainment
-install %{SOURCE1} $RPM_BUILD_ROOT/%{_desktopdir}/Edutainment/KLogic.desktop
+mv $RPM_BUILD_ROOT%{_pixmapsdir}/klogic/* $RPM_BUILD_ROOT%{_pixmapsdir}
+install -d $RPM_BUILD_ROOT%{_desktopdir}/kde
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/kde/KLogic.desktop
%find_lang %{name} --with-kde
@@ -64,17 +65,19 @@
%defattr(644,root,root,755)
%doc examples/*.circuit
%attr(755,root,root) %{_bindir}/*
-%{_desktopdir}/Edutainment/*
+%{_desktopdir}/kde/*.desktop
%{_datadir}/apps/klogic
%{_pixmapsdir}/klogic*.xpm
-
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[EMAIL PROTECTED]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.7 2006/06/11 18:48:24 qboosh
+- fixed desktop dir, BR: automake,rpmbuild(macros) for kdedocdir
+
Revision 1.6 2006/06/11 17:59:42 bszx
- updated to 1.63
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/klogic.spec?r1=1.6&r2=1.7&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
