rpms/smb4k/devel .cvsignore, 1.25, 1.26 smb4k.spec, 1.36, 1.37 sources, 1.25, 1.26

[Marcin Garski]

Author: mgarski

Update of /cvs/pkgs/rpms/smb4k/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30538

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Update to 0.10.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/smb4k/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	30 Jul 2008 16:21:33 -0000	1.25
+++ .cvsignore	4 Sep 2008 18:16:22 -0000	1.26
@@ -1 +1 @@
-smb4k-0.9.6.tar.bz2
+smb4k-0.10.0.tar.bz2


Index: smb4k.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smb4k/devel/smb4k.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- smb4k.spec	30 Jul 2008 16:21:33 -0000	1.36
+++ smb4k.spec	4 Sep 2008 18:16:22 -0000	1.37
@@ -1,5 +1,5 @@
 Name:		smb4k
-Version:	0.9.6
+Version:	0.10.0
 Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
@@ -9,7 +9,8 @@
 Source0:	http://download.berlios.de/smb4k/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	kdelibs3-devel kdebase3-devel gettext desktop-file-utils
+BuildRequires:	cmake >= 2.6.0
+BuildRequires:	kdelibs-devel >= 4.1.0 desktop-file-utils
 Requires:	samba-client
 
 %description
@@ -30,27 +31,23 @@
 %setup -q
 
 %build
-unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
 
-%configure \
-	--disable-rpath \
-	--disable-debug \
-	--disable-dependency-tracking \
-	--with-konqplugin=no
-# Broken on 0.7.0
-#	--enable-final
-make %{?_smp_mflags}
+make %{?_smp_mflags} -C %{_target_platform}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 desktop-file-install --vendor="" \
-	--dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+	--dir=%{buildroot}%{_datadir}/applications/kde4 \
 	--add-category Network \
 	--add-category FileTransfer \
 	--add-category FileManager \
-	$RPM_BUILD_ROOT%{_datadir}/applications/kde/smb4k.desktop
+	%{buildroot}%{_datadir}/applications/kde4/smb4k.desktop
 
 # Make symlink relative
 pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en/smb4k/
@@ -59,48 +56,47 @@
 
 %find_lang %{name}
 
-# Bug #435149
-#rm -f $RPM_BUILD_ROOT%{_libdir}/libsmb4k*.la
-
 %post
 /sbin/ldconfig
 
-touch --no-create %{_datadir}/icons/crystalsvg || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
-fi
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun
 /sbin/ldconfig
 
-touch --no-create %{_datadir}/icons/crystalsvg || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
-fi
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS ChangeLog COPYING FAQ README TODO
-%{_bindir}/*
-%{_libdir}/kde3/libsmb4k*.*
-%{_libdir}/libsmb4k*.la
-%{_libdir}/libsmb4kdialogs.so
-%{_libdir}/libsmb4k*.so.*
-%{_datadir}/applications/kde/smb4k.desktop
-%{_datadir}/apps/smb4k*/
-%{_datadir}/config.kcfg/smb4k.kcfg
-%{_docdir}/HTML/en/smb4k/
-%{_datadir}/icons/crystalsvg/*/apps/smb4k.png
+%{_kde4_bindir}/*
+%{_kde4_libdir}/kde4/libsmb4k*.*
+%{_kde4_libdir}/libsmb4k*.so.*
+%{_kde4_libdir}/libsmb4kdialogs.so
+%{_kde4_datadir}/applications/kde4/smb4k.desktop
+%{_kde4_datadir}/config.kcfg/smb4k.kcfg
+%{_kde4_docdir}/HTML/en/smb4k/
+%{_kde4_iconsdir}/hicolor/*/apps/smb4k.png
+%{_kde4_iconsdir}/oxygen/*/apps/smb4k.png
+%{_kde4_datadir}/kde4/apps/kconf_update/*
+%{_kde4_datadir}/kde4/apps/smb4k/
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/smb4k*.h
+%{_kde4_includedir}/smb4k*.h
 %{_libdir}/libsmb4kc*.so
 
 %changelog
+* Thu Sep 04 2008 Marcin Garski <mgarski[AT]post.pl> 0.10.0-1
+- Update to 0.10.0
+
 * Wed Jul 30 2008 Marcin Garski <mgarski[AT]post.pl> 0.9.6-1
 - Update to 0.9.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smb4k/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	30 Jul 2008 16:21:33 -0000	1.25
+++ sources	4 Sep 2008 18:16:22 -0000	1.26
@@ -1 +1 @@
-e02948415fc2b56c4f6bf0c6dff9dbad  smb4k-0.9.6.tar.bz2
+9b41d9041894abc1c8cc5c71e58d3ec2  smb4k-0.10.0.tar.bz2