rpms/krusader/FC-3 .cvsignore, 1.3, 1.4 krusader.spec, 1.4, 1.5 sources, 1.3, 1.4 krusader-1.60.0-desktop.patch, 1.2, NONE krusader-1.60.0-gcc4.patch, 1.1, NONE krusader-1.60.0-newline.patch, 1.1, NONE

[Marcin Garski (mgarski)]

Author: mgarski

Update of /cvs/extras/rpms/krusader/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19405

Modified Files:
	.cvsignore krusader.spec sources 
Removed Files:
	krusader-1.60.0-desktop.patch krusader-1.60.0-gcc4.patch 
	krusader-1.60.0-newline.patch 
Log Message:
- Remove all patches (merged upstream)
- Updated to version 1.70.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/krusader/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Dec 2005 20:46:38 -0000	1.3
+++ .cvsignore	14 Feb 2006 18:49:51 -0000	1.4
@@ -1,2 +1 @@
-krusader-1.60.0.tar.gz
-krusader-1.60.1.tar.gz
+krusader-1.70.0.tar.gz


Index: krusader.spec
===================================================================
RCS file: /cvs/extras/rpms/krusader/FC-3/krusader.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- krusader.spec	12 Dec 2005 20:46:38 -0000	1.4
+++ krusader.spec	14 Feb 2006 18:49:51 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		krusader
-Version:	1.60.1
+Version:	1.70.0
 Release:	1%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
@@ -7,15 +7,11 @@
 License:	GPL
 URL:		http://krusader.sourceforge.net/
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:		krusader-1.60.0-desktop.patch
-Patch1:		krusader-1.60.0-gcc4.patch
-Patch2:		krusader-1.60.0-newline.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	kdelibs-devel >= 3.3.0 qt-devel >= 3.3.0 arts-devel >= 1.3.0
-BuildRequires:	kdebase-devel >= 3.3.0 kdebindings-devel >= 3.3.0 gamin-devel
-BuildRequires:	libpng-devel libselinux-devel automake desktop-file-utils
-BuildRequires:	gettext
+BuildRequires:	qt-devel kdelibs-devel kdebase-devel kdebindings-devel
+BuildRequires:	desktop-file-utils automake gettext
+BuildRequires:	arts-devel libpng-devel gamin-devel
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -35,17 +31,15 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
+unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure \
-	--disable-rpath
-
+	--disable-rpath \
+	--disable-debug \
+	--disable-dependency-tracking
 make %{?_smp_mflags}
 
 %install
@@ -55,7 +49,7 @@
 desktop-file-install --vendor fedora --delete-original \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	--add-category X-Fedora \
-	$RPM_BUILD_ROOT%{_datadir}/applnk/Applications/*.desktop
+	$RPM_BUILD_ROOT%{_datadir}/applnk/*.desktop
 
 # Workaround for some wicked install bug
 rm -rf $RPM_BUILD_ROOT%{_tmppath}
@@ -70,17 +64,27 @@
 %post
 update-desktop-database &> /dev/null ||:
 
-touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/crystalsvg || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+fi
+
+touch --no-create %{_datadir}/icons/locolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/locolor || :
 fi
 
 %postun
 update-desktop-database &> /dev/null ||:
 
-touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/crystalsvg || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+fi
+
+touch --no-create %{_datadir}/icons/locolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/locolor || :
 fi
 
 %clean
@@ -96,52 +100,73 @@
 %{_datadir}/apps/konqueror/servicemenus/isoservice.desktop
 %{_datadir}/apps/krusader/
 %{_datadir}/config/kio_isorc
-%{_datadir}/doc/HTML/en/*
-%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/doc/HTML/en/krusader/
+%{_datadir}/icons/crystalsvg/*/apps/*
+%{_datadir}/icons/locolor/*/apps/*
 %{_mandir}/man1/krusader.1*
 %{_datadir}/services/iso.protocol
 %{_datadir}/services/krarc.protocol
 
 %changelog
-* Mon Dec 12 2005 Marcin Garski <mgarski at post.pl> 1.60.1-1
+* Mon Feb 13 2006 Marcin Garski <mgarski[AT]post.pl> 1.70.0-1
+- Remove all patches (merged upstream)
+- Updated to version 1.70.0
+
+* Mon Jan 16 2006 Marcin Garski <mgarski[AT]post.pl> 1.60.1-6
+- Remove --enable-final
+
+* Mon Jan 16 2006 Marcin Garski <mgarski[AT]post.pl> 1.60.1-5
+- Remove --disable-dependency-tracking
+
+* Sun Jan 15 2006 Marcin Garski <mgarski[AT]post.pl> 1.60.1-4
+- Change "/etc/profile.d/qt.sh" to "%{_sysconfdir}/profile.d/qt.sh"
+- Add --disable-debug --disable-dependency-tracking & --enable-final
+
+* Wed Dec 14 2005 Marcin Garski <mgarski[AT]post.pl> 1.60.1-3
+- Add to BR libacl-devel
+
+* Tue Dec 13 2005 Marcin Garski <mgarski[AT]post.pl> 1.60.1-2
+- Fix for modular X.Org
+
+* Mon Dec 12 2005 Marcin Garski <mgarski[AT]post.pl> 1.60.1-1
 - Updated to version 1.60.1 which fix CVE-2005-3856
 
-* Sun Oct 23 2005 Marcin Garski <mgarski at post.pl> 1.60.0-4
+* Sun Oct 23 2005 Marcin Garski <mgarski[AT]post.pl> 1.60.0-4
 - Added update-mime-database and gtk-update-icon-cache (bug #171547)
 
-* Thu Aug 25 2005 Marcin Garski <mgarski at post.pl> 1.60.0-3
+* Thu Aug 25 2005 Marcin Garski <mgarski[AT]post.pl> 1.60.0-3
 - Include .la files
 - Include actions_tutorial.txt
 - Fix krusader_root-mode.desktop file to show only in KDE and under System
   category
 - Fix compile warnings
 
-* Fri Aug 12 2005 Marcin Garski <mgarski at post.pl> 1.60.0-2
+* Fri Aug 12 2005 Marcin Garski <mgarski[AT]post.pl> 1.60.0-2
 - Spec improvements for Fedora Extras
 
-* Wed Aug 10 2005 Marcin Garski <mgarski at post.pl> 1.60.0-1
+* Wed Aug 10 2005 Marcin Garski <mgarski[AT]post.pl> 1.60.0-1
 - Updated to version 1.60.0 & clean up for Fedora Extras
 
-* Fri Dec 17 2004 Marcin Garski <mgarski at post.pl> 1.51.fc2kde331
+* Fri Dec 17 2004 Marcin Garski <mgarski[AT]post.pl> 1.51.fc2kde331
 - Updated to version 1.51
 
-* Sat Nov 11 2004 Marcin Garski <mgarski at post.pl> 1.50.fc2kde331
+* Sat Nov 11 2004 Marcin Garski <mgarski[AT]post.pl> 1.50.fc2kde331
 - Added Requires:
 
-* Tue Nov 02 2004 Marcin Garski <mgarski at post.pl> 1.50.fc2
+* Tue Nov 02 2004 Marcin Garski <mgarski[AT]post.pl> 1.50.fc2
 - Updated to version 1.50 & spec cleanup
 
-* Fri Aug 06 2004 Marcin Garski <mgarski at post.pl> 1.40-1.fc2
+* Fri Aug 06 2004 Marcin Garski <mgarski[AT]post.pl> 1.40-1.fc2
 - Updated to version 1.40
 
-* Wed Jun 23 2004 Marcin Garski <mgarski at post.pl> 1.40-beta2.fc2
+* Wed Jun 23 2004 Marcin Garski <mgarski[AT]post.pl> 1.40-beta2.fc2
 - Updated to version 1.40-beta2
 
-* Wed Jun 02 2004 Marcin Garski <mgarski at post.pl> 1.40-beta1.fc2
+* Wed Jun 02 2004 Marcin Garski <mgarski[AT]post.pl> 1.40-beta1.fc2
 - Rebuild for Fedora Core 2 & huge spec cleanup
 
-* Mon Nov 17 2003 11:05:00 Marian POPESCU <softexpert at libertysurf.fr> [1.30]
+* Mon Nov 17 2003 11:05:00 Marian POPESCU <softexpert[AT]libertysurf.fr> [1.30]
 - Updated to 1.30 release + changed description to match the official one
 
-* Tue Jul 03 2003 17:00:00 Marcin Garski <mgarski at post.pl> [1.20]
+* Tue Jul 03 2003 17:00:00 Marcin Garski <mgarski[AT]post.pl> [1.20]
 - Initial specfile


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/krusader/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Dec 2005 20:46:38 -0000	1.3
+++ sources	14 Feb 2006 18:49:51 -0000	1.4
@@ -1,2 +1 @@
-95f7900799bbd2810e6ac06fbf628536  krusader-1.60.0.tar.gz
-18b3b6f247c08b76113bcb9f2c666a6a  krusader-1.60.1.tar.gz
+3c2d73637c72e1042fef52ad1a336a64  krusader-1.70.0.tar.gz


--- krusader-1.60.0-desktop.patch DELETED ---


--- krusader-1.60.0-gcc4.patch DELETED ---


--- krusader-1.60.0-newline.patch DELETED ---