Author: darekr Date: Thu Dec 7 23:56:52 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- kill obsoleted kde_ redefinition, BR: libstdc++-devel, use _iconsdir
---- Files affected:
SPECS:
kacpi.spec (1.11 -> 1.12)
---- Diffs:
================================================================
Index: SPECS/kacpi.spec
diff -u SPECS/kacpi.spec:1.11 SPECS/kacpi.spec:1.12
--- SPECS/kacpi.spec:1.11 Tue Jun 14 21:12:32 2005
+++ SPECS/kacpi.spec Fri Dec 8 00:56:46 2006
@@ -14,10 +14,10 @@
BuildRequires: automake
BuildRequires: gettext-devel
BuildRequires: kdelibs-devel >= 3.0
+BuildRequires: libstdc++-devel
+BuildRequires: rpmbuild(macros) >= 1.129
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _htmldir /usr/share/doc/kde/HTML
-
%description
Kacpi is a laptop battery and CPU temperature monitor for Linux
kernels with ACPI support.
@@ -41,9 +41,7 @@
%patch0 -p1
%build
-kde_htmldir="%{_htmldir}"; export kde_htmldir
-# no icon themes, *.png installed directly to icondir - so use pixmapsdir
-kde_icondir="%{_pixmapsdir}"; export kde_icondir
+kde_htmldir="%{_kdedocdir}"; export kde_htmldir
cp -f /usr/share/automake/config.* admin
%configure
@@ -63,9 +61,9 @@
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc README AUTHORS
+%doc AUTHORS ChangeLog README
%attr(755,root,root) %{_bindir}/*
-%{_pixmapsdir}/*.png
+%{_iconsdir}/*.png
%{_desktopdir}/*.desktop
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -74,6 +72,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.12 2006/12/07 23:56:46 darekr
+- kill obsoleted kde_ redefinition, BR: libstdc++-devel, use _iconsdir
+
Revision 1.11 2005/06/14 19:12:32 zbyniu
- BR: gettext-devel
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kacpi.spec?r1=1.11&r2=1.12&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
