SPECS: superkaramba.spec - up to 0.37 RC1 - TODO added (problem wi...

[blekot]

Author: blekot                       Date: Wed Aug  3 12:24:44 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 0.37 RC1
- TODO added (problem with find lang)
- builds, not tested

---- Files affected:
SPECS:
   superkaramba.spec (1.61 -> 1.62) 

---- Diffs:

================================================================
Index: SPECS/superkaramba.spec
diff -u SPECS/superkaramba.spec:1.61 SPECS/superkaramba.spec:1.62
--- SPECS/superkaramba.spec:1.61	Sun May 29 02:28:41 2005
+++ SPECS/superkaramba.spec	Wed Aug  3 14:24:39 2005
@@ -1,13 +1,17 @@
 # $Revision$, $Date$
+# TODO:
+# check lang!!!! (find_lang karamba --with-kde doesn't work) chgw why?
+
 Summary:	Little interactive widgets on KDE desktop
 Summary(pl):	Małe interaktywne widżety na pulpicie KDE
 Name:		superkaramba
-Version:	0.36
-Release:	1
+Version:	0.37
+%define		_rc	RC1
+Release:	0.%{_rc}.1
 License:	GPL
 Group:		X11/Applications
-Source0:	http://dl.sourceforge.net/netdragon/%{name}-%{version}.tar.gz
-# Source0-md5:	b26f7da9e0ae1901cba5b555d77ce788
+Source0:	http://dl.sourceforge.net/netdragon/%{name}-%{version}-%{_rc}.tar.gz
+# Source0-md5:	458c6b9c9379ee509957b01c7ca56079
 # Scripts widely used by superkaramba theme creators
 Source1:	http://www.efd.lth.se/~d98hk/karamba/scripts/scripts.tar.gz
 # Source1-md5:	94f0620854df678c4e7908679f139a78
@@ -27,7 +31,7 @@
 # TubeClock theme
 Source6:	TubeClock.tar.bz2
 # Source6-md5:	ced8e1f6772bc0ed224971d3bbd9ec4e
-Patch0:		%{name}-src-configfix.patch
+Patch0:		%{name}-karamba.cpp.patch
 Patch1:		%{name}-desktop.patch
 Patch2:		%{name}-configure.patch
 Patch3:		%{name}-Makefile.in.patch
@@ -120,8 +124,8 @@
 Motyw zegara lampowego dla widżetu %{name}.
 
 %prep
-%setup -q -a1 -a2 -a3 -a4 -a6
-#%patch0 -p1
+%setup -q -a1 -a2 -a3 -a4 -a6 -n %{name}-%{version}-%{_rc}
+%patch0 -p0
 %patch1 -p0
 %patch2 -p0
 %patch3 -p0
@@ -140,7 +144,7 @@
 # remove duplicated .desktop file
 #rm src/karamba.desktop
 
-moc src/karamba.h -o src/karamba.moc
+moc superkaramba/src/karamba.h -o superkaramba/src/karamba.moc
 #%{__aclocal}
 #%{__autoconf}
 #%{__autoheader}
@@ -156,9 +160,15 @@
 
 %{__make}
 
+cd superkaramba
+%{__make} install \
+        DESTDIR=$RPM_BUILD_ROOT
+cd -
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_pixmapsdir} \
+	$RPM_BUILD_ROOT%{_bindir} \
 	$RPM_BUILD_ROOT%{_desktopdir} \
 	$RPM_BUILD_ROOT%{_datadir}/themes/superkaramba/OSXDocker/Icons \
 	$RPM_BUILD_ROOT%{_datadir}/themes/superkaramba/tuxbar/pics \
@@ -185,9 +195,13 @@
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
-install src/superkaramba.desktop $RPM_BUILD_ROOT%{_desktopdir}
-install src/lo16-app-karamba.png $RPM_BUILD_ROOT%{_pixmapsdir}
-install src/lo32-app-karamba.png $RPM_BUILD_ROOT%{_pixmapsdir}
+cd superkaramba
+%{__make} install \
+        DESTDIR=$RPM_BUILD_ROOT
+cd -
+
+install %{name}/src/%{name}.desktop $RPM_BUILD_ROOT%{_desktopdir}
+#install %{name}/icons/*.{png,svgz} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 # Scripts
 install scripts/* $RPM_BUILD_ROOT%{_bindir}
@@ -241,19 +255,21 @@
 rm $RPM_BUILD_ROOT%{_datadir}/themes/superkaramba/PNM4/news/*/newstemp
 rm -frd $RPM_BUILD_ROOT%{_datadir}/themes/superkaramba/TubeClock/pics/.xvpics/
 
-%find_lang karamba --with-kde
+#%find_lang karamba --with-kde
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f karamba.lang
+%files
+#  -f karamba.lang
 %defattr(644,root,root,755)
 %doc ChangeLog README
 %attr(755,root,root) %{_bindir}/superkaramba
 %{_desktopdir}/superkaramba.desktop
-%{_pixmapsdir}/lo16-app-karamba.png
-%{_pixmapsdir}/lo32-app-karamba.png
+%{_iconsdir}/*/*/*/*.png
+%{_iconsdir}/*/*/*/*.svgz
 %dir %{_datadir}/apps/superkaramba
-%{_datadir}/apps/superkaramba/karambaui.rc
+%{_datadir}/mimelnk/application/*.desktop
+%{_datadir}/apps/superkaramba/superkarambaui.rc
 %{_datadir}/themes/superkaramba/.directory
 %dir %{_datadir}/themes/superkaramba
 
@@ -312,7 +328,7 @@
 #%dir %{_datadir}/themes/superkaramba/PNM4/news/17_www.medialink.pl
 %{_datadir}/themes/superkaramba/PNM4/PNM4.*
 %attr(755,root,root) %{_datadir}/themes/superkaramba/PNM4/install
-#%attr(755,root,root) %{_datadir}/themes/superkaramba/PNM4/news/*/newstemp
+#attr(755,root,root) %{_datadir}/themes/superkaramba/PNM4/news/*/newstemp
 %attr(755,root,root) %{_datadir}/themes/superkaramba/PNM4/news/*/getNews
 %attr(755,root,root) %{_datadir}/themes/superkaramba/PNM4/news/*/loader
 %{_datadir}/themes/superkaramba/PNM4/news/*/*.png
@@ -335,6 +351,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.62  2005/08/03 12:24:39  blekot
+- up to 0.37 RC1
+- TODO added (problem with find lang)
+- builds, not tested
+
 Revision 1.61  2005/05/29 00:28:41  blekot
 - rel 1 (STBR if test build passed)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/superkaramba.spec?r1=1.61&r2=1.62&f=u