SPECS: kdeartwork.spec, kdetoys.spec - 3.5.5 .hidden

Thu Oct 5 02:36:16 CEST 2006

Author: adgor                        Date: Thu Oct  5 00:36:16 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 3.5.5 .hidden

---- Files affected:
SPECS:
   kdeartwork.spec (1.108 -> 1.109) , kdetoys.spec (1.98 -> 1.99) 

---- Diffs:

================================================================
Index: SPECS/kdeartwork.spec
diff -u SPECS/kdeartwork.spec:1.108 SPECS/kdeartwork.spec:1.109

--- SPECS/kdeartwork.spec:1.108	Mon Jul 31 17:57:27 2006
+++ SPECS/kdeartwork.spec	Thu Oct  5 02:36:10 2006
@@ -13,13 +13,13 @@
 Summary(pl):	K Desktop Environment - grafiki itp.
 Summary(pt_BR):	K Desktop Environment - Plugins e Scripts para aplicaçőes KDE
 Name:		kdeartwork
-Version:	3.5.4
-Release:	1
+Version:	3.5.5
+Release:	0.1
 Epoch:		8
 License:	LGPL
 Group:		X11/Libraries
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5:	c7ff9048b9b68c976de08ed418598e40
+# Source0-md5:	8d35156b506cf870eb9641f72a304c8c
 Patch0:		%{name}-screensavers.patch
 Patch1:		%{name}-xscreensaver-dir.patch
 URL:		http://www.kde.org/
@@ -383,13 +383,13 @@
 %configure \
 	XSCREENSAVER=/usr/%{_lib}/xscreensaver/flame \
 	XSCREENSAVER_CONFIG=/usr/share/xscreensaver \
-	--disable-rpath \
+	--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
+	%{!?debug:--disable-rpath} \
 	--disable-final \
-	--with-qt-libraries=%{_libdir} \
 %if "%{_lib}" == "lib64"
 	--enable-libsuffix=64 \
 %endif
-	--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full}
+	--with-qt-libraries=%{_libdir}
 
 %{__make}
 
@@ -398,22 +398,13 @@
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	kde_htmldir=%{_kdedocdir} \
-	kde_libs_htmldir=%{_kdedocdir}
+	kde_htmldir=%{_kdedocdir}
 
 # Makefile installs these basing on XSCREENSAVER_DIR/* files -
 # let's do it manually to avoid BR: xscreensaver{,-GL,-GLE}
 install kscreensaver/kxsconfig/ScreenSavers/*.desktop $RPM_BUILD_ROOT%{_datadir}/apps/kscreensaver
 rm -f $RPM_BUILD_ROOT%{_datadir}/apps/kscreensaver/pixmaps.desktop
 
-%if 0
-# Debian manpages
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
-# these don't exist in 3.2:
-#rm -f debian/{kbouboule,kmatrix,kmorph3d,kpipes,kpyro,krock,kslidescreen}.kss.1
-install debian/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -531,7 +522,6 @@
 %attr(755,root,root) %{_bindir}/*.kss
 %{_datadir}/apps/kfiresaver
 %{_datadir}/apps/kscreensaver/*.png
-#%{_mandir}/man1/*.kss.1*
 
 # KDE xscreensaver wrappers (should R: xscreensaver?)
 %attr(755,root,root) %{_bindir}/kxsconfig
@@ -539,8 +529,6 @@
 # extrusion.desktop is for xscreensaver-GLE, the rest for xscreensaver{,-GL}
 %{_datadir}/apps/kscreensaver/*.desktop
 #%{_datadir}/config/*rc
-#%{_mandir}/man1/kxsconfig.1*
-#%{_mandir}/man1/kxsrun.1*
 
 %files sounds
 %defattr(644,root,root,755)
@@ -556,6 +544,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.109  2006/10/05 00:36:10  adgor
+- 3.5.5 .hidden
+
 Revision 1.108  2006/07/31 15:57:27  glen
 - adapterized
 

================================================================
Index: SPECS/kdetoys.spec
diff -u SPECS/kdetoys.spec:1.98 SPECS/kdetoys.spec:1.99
--- SPECS/kdetoys.spec:1.98	Mon Jul 31 13:24:48 2006
+++ SPECS/kdetoys.spec	Thu Oct  5 02:36:11 2006
@@ -10,13 +10,13 @@
 Summary(pl):	Zabawki dla KDE
 Summary(zh_CN):	KDEÓéŔÖłĚĐň
 Name:		kdetoys
-Version:	3.5.4
-Release:	1
+Version:	3.5.5
+Release:	0.1
 Epoch:		9
 License:	GPL
 Group:		X11/Applications/Graphics
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5:	f959e936d05697ac6b1a0b066632b2fd
+# Source0-md5:	2b03fd068209cf324396b75334f39aba
 #Patch100:	%{name}-branch.diff
 Patch0:		%{name}-screensavers.patch
 URL:		http://www.kde.org/
@@ -28,7 +28,6 @@
 BuildRequires:	libpng-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	rpmbuild(macros) >= 1.129
-#BuildRequires:	unsermake >= 040511
 BuildRequires:	zlib-devel
 BuildConflicts:	kdetoys-ww
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -210,14 +209,7 @@
 #%%patch100 -p1
 %patch0 -p1
 
-%{__sed} -i -e 's/Terminal=0/Terminal=false/' \
-	amor/amor.desktop \
-	kodo/kodo.desktop \
-	kteatime/kteatime.desktop
 for f in `find . -name \*.desktop`; do
-	if grep -q '^Categories=.*[^;]$' $f; then
-		sed -i -e 's/\(^Categories=.*$\)/\1;/' $f
-	fi
 	if grep -q '\[ven\]' $f; then
 		sed -i -e 's/\[ven\]/[ve]/' $f
 	fi
@@ -226,18 +218,16 @@
 %build
 cp %{_datadir}/automake/config.sub admin
 
-#export UNSERMAKE=%{_datadir}/unsermake/unsermake
-
 %{__make} -f admin/Makefile.common cvs
 
 %configure \
-	--disable-rpath \
+	--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
+	%{!?debug:--disable-rpath} \
 	--disable-final \
-	--with-qt-libraries=%{_libdir} \
 %if "%{_lib}" == "lib64"
 	--enable-libsuffix=64 \
 %endif
-	--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full}
+	--with-qt-libraries=%{_libdir}
 
 %{__make}
 
@@ -247,15 +237,8 @@
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	kde_libs_htmldir=%{_kdedocdir} \
 	kde_htmldir=%{_kdedocdir}
 
-%if 0
-# Debian manpages
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install debian/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
-%endif
-
 %find_lang amor		--with-kde
 %find_lang kmoon	--with-kde
 %find_lang kodo		--with-kde
@@ -276,7 +259,6 @@
 %{_datadir}/apps/amor
 %{_desktopdir}/kde/amor.desktop
 %{_iconsdir}/*/*/*/amor*
-#%{_mandir}/man1/amor.1*
 
 %files eyes
 %defattr(644,root,root,755)
@@ -297,7 +279,6 @@
 %{_datadir}/apps/kicker/applets/kmoonapplet.desktop
 %{_datadir}/apps/kmoon
 %{_iconsdir}/*/*/*/kmoon*
-#%{_mandir}/man1/kmoon.1*
 
 %files kodo -f kodo.lang
 %defattr(644,root,root,755)
@@ -305,7 +286,6 @@
 %{_datadir}/apps/kodo
 %{_desktopdir}/kde/kodo.desktop
 %{_iconsdir}/*/*/*/kodo*
-#%{_mandir}/man1/kodo.1*
 
 %files kteatime -f kteatime.lang
 %defattr(644,root,root,755)
@@ -313,7 +293,6 @@
 %{_datadir}/apps/kteatime
 %{_desktopdir}/kde/kteatime.desktop
 %{_iconsdir}/*/*/*/kteatime*
-#%{_mandir}/man1/kteatime.1*
 
 %files ktux
 %defattr(644,root,root,755)
@@ -321,7 +300,6 @@
 %{_datadir}/apps/ktux
 %{_datadir}/apps/kscreensaver/ktux.desktop
 %{_iconsdir}/*/*/*/ktux.*
-#%{_mandir}/man1/ktux.1*
 
 %files kweather -f kweather.lang
 %defattr(644,root,root,755)
@@ -344,8 +322,6 @@
 %{_datadir}/services/kweatherservice.desktop
 %{_datadir}/apps/kweather
 %{_iconsdir}/*/*/apps/kweather.png
-#%{_mandir}/man1/kweatherreport.1*
-#%{_mandir}/man1/kweatherservice.1*
 
 %files kworldclock -f kworldclock.lang
 %defattr(644,root,root,755)
@@ -354,7 +330,6 @@
 %{_datadir}/apps/kdesktop/programs/kdeworld.desktop
 %{_desktopdir}/kde/kworldclock.desktop
 %{_iconsdir}/*/*/*/kworldclock*
-#%{_mandir}/man1/kworldclock.1*
 %{_libdir}/kde3/ww_panelapplet.la
 %attr(755,root,root) %{_libdir}/kde3/ww_panelapplet.so
 %{_datadir}/apps/kicker/applets/kwwapplet.desktop
@@ -365,6 +340,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.99  2006/10/05 00:36:11  adgor
+- 3.5.5 .hidden
+
 Revision 1.98  2006/07/31 11:24:48  arekm
 - up to 3.5.4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdeartwork.spec?r1=1.108&r2=1.109&f=u
    http://cvs.pld-linux.org/SPECS/kdetoys.spec?r1=1.98&r2=1.99&f=u

