rpms/krusader/devel .cvsignore, 1.8, 1.9 krusader.spec, 1.22, 1.23 sources, 1.8, 1.9

[Marcin Garski]

Author: mgarski

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

Modified Files:
	.cvsignore krusader.spec sources 
Log Message:
- Update to 2.0.0-beta1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/krusader/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	13 Apr 2008 20:02:06 -0000	1.8
+++ .cvsignore	15 Oct 2008 23:34:12 -0000	1.9
@@ -1 +1 @@
-krusader-1.90.0.tar.gz
+krusader-2.0.0-beta1.tar.gz


Index: krusader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krusader/devel/krusader.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- krusader.spec	15 Oct 2008 16:29:36 -0000	1.22
+++ krusader.spec	15 Oct 2008 23:34:12 -0000	1.23
@@ -1,17 +1,22 @@
+%define beta beta1
+
 Name:		krusader
-Version:	1.90.0
-Release:	3%{?dist}
+Version:	2.0.0
+Release:	0.1.%{beta}%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
 License:	GPLv2+
 URL:		http://krusader.sourceforge.net/
-Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?beta:-%{beta}}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	kdelibs3-devel kdebase3-devel
-BuildRequires:	libpng-devel gamin-devel libacl-devel
-BuildRequires:	desktop-file-utils automake gettext
+BuildRequires:	cmake
+BuildRequires:	kdelibs-devel >= 4.1.0 phonon-devel
+BuildRequires:	libjpeg-devel libpng-devel giflib-devel
+BuildRequires:	zlib-devel bzip2-devel
+BuildRequires:	pcre-devel gamin-devel libacl-devel
+BuildRequires:	xdg-utils gettext
 
 %description
 Krusader is an advanced twin panel (commander style) file manager for KDE and
@@ -25,20 +30,19 @@
 friendly, fast and looks great on your desktop! You should give it a try.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?beta:-%{beta}}
 
 %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
-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}
 
 # Make symlink relative and remove wrong EOL
 pushd $RPM_BUILD_ROOT%{_docdir}/HTML/
@@ -57,51 +61,36 @@
 
 %find_lang %{name}
 
-# hack: use hicolor instead of crystalsvg
-mv $RPM_BUILD_ROOT%{_datadir}/icons/crystalsvg \
-   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor
-
 %post
-update-desktop-database &> /dev/null ||:
-
-touch --no-create %{_datadir}/icons/hicolor|| :
-touch --no-create %{_datadir}/icons/locolor || :
-
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hiclor || :
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/locolor || :
-fi
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun
-update-desktop-database &> /dev/null ||:
-
-touch --no-create %{_datadir}/icons/hicolor|| :
-touch --no-create %{_datadir}/icons/locolor || :
-
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hiclor || :
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/locolor || :
-fi
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme locolor 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 doc/actions_tutorial.txt AUTHORS ChangeLog COPYING CVSNEWS FAQ README TODO
-%{_bindir}/krusader
-%{_libdir}/kde3/kio_*.*
-%{_datadir}/applications/kde/*krusader*.desktop
-%{_datadir}/apps/konqueror/servicemenus/isoservice.desktop
-%{_datadir}/apps/krusader/
-%{_datadir}/config/kio_isorc
-%{_docdir}/HTML/*/krusader/
-%{_datadir}/icons/hicolor/*/apps/*
-%{_datadir}/icons/locolor/*/apps/*
-%{_mandir}/man1/krusader.1*
-%{_datadir}/services/*.protocol
+%doc doc/actions_tutorial.txt AUTHORS ChangeLog COPYING CVSNEWS FAQ README SVNNEWS TODO
+%{_kde4_bindir}/*
+%{_kde4_libdir}/kde4/*.so
+%{_kde4_datadir}/applications/kde4/krusader*.desktop
+%{_kde4_datadir}/config/kio_isorc
+%{_kde4_docdir}/HTML/en/krusader/
+%{_kde4_iconsdir}/hicolor/*/apps/*.png
+%{_kde4_iconsdir}/locolor/*/apps/*.png
+%{_kde4_datadir}/kde4/apps/krusader/
+%{_kde4_datadir}/kde4/services/*.protocol
 
 %changelog
+* Thu Oct 16 2008 Marcin Garski <mgarski[AT]post.pl> 2.0.0-0.1.beta1
+- Update to 2.0.0-beta1
+
 * Wed Oct 15 2008 Rex Dieter <rdieter at fedoraproject.org> 1.90.0-3
 - s/crystalsvg/hicolor/ icon theme, so they show for everyone (#467076)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krusader/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	13 Apr 2008 20:02:06 -0000	1.8
+++ sources	15 Oct 2008 23:34:12 -0000	1.9
@@ -1 +1 @@
-0bcf8f4d03484dae0390ffafa953ac40  krusader-1.90.0.tar.gz
+8c068962fa3ecaf26f306a72ea874512  krusader-2.0.0-beta1.tar.gz