rpms/krusader/devel .cvsignore, 1.5, 1.6 krusader.spec, 1.13, 1.14 sources, 1.5, 1.6

[Marcin Garski (mgarski)]

Author: mgarski

Update of /cvs/extras/rpms/krusader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24154

Modified Files:
	.cvsignore krusader.spec sources 
Log Message:
- Updated to version 1.80.0-beta2
- Drop X-Fedora category



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/krusader/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Jul 2006 21:50:37 -0000	1.5
+++ .cvsignore	20 Apr 2007 11:35:07 -0000	1.6
@@ -1 +1 @@
-krusader-1.70.1.tar.gz
+krusader-1.80.0-beta2.tar.gz


Index: krusader.spec
===================================================================
RCS file: /cvs/extras/rpms/krusader/devel/krusader.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- krusader.spec	31 Aug 2006 22:56:07 -0000	1.13
+++ krusader.spec	20 Apr 2007 11:35:07 -0000	1.14
@@ -1,17 +1,19 @@
+%define alphatag beta2
+
 Name:		krusader
-Version:	1.70.1
-Release:	2%{?dist}
+Version:	1.80.0
+Release:	0.1.%{alphatag}%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
 License:	GPL
 URL:		http://krusader.sourceforge.net/
-Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}-%{alphatag}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	qt-devel kdelibs-devel kdebase-devel kdebindings-devel
+BuildRequires:	arts-devel libpng-devel gamin-devel libacl-devel
 BuildRequires:	desktop-file-utils automake gettext
-BuildRequires:	arts-devel libpng-devel gamin-devel
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -30,7 +32,7 @@
 You should give it a try.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-%{alphatag}
 
 %build
 unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
@@ -47,18 +49,18 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install --vendor fedora --delete-original \
-	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category X-Fedora \
-	$RPM_BUILD_ROOT%{_datadir}/applnk/*.desktop
-
-# Workaround for some wicked install bug
-rm -rf $RPM_BUILD_ROOT%{_tmppath}
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+	$RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
 
 # Make symlink relative
 pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en/krusader/
 ln -sf ../common
 popd
 
+# Fix FAQ encoding
+iconv -f ISO-8859-1 -t UTF-8 < FAQ > FAQ.tmp
+mv -f FAQ.tmp FAQ
+
 %find_lang %{name}
 
 %post
@@ -91,23 +93,25 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %name.lang
-%defattr(-, root, root)
+%defattr(-,root,root,-)
 %doc doc/actions_tutorial.txt AUTHORS ChangeLog COPYING CVSNEWS FAQ README TODO
 %{_bindir}/krusader
-%{_libdir}/kde3/kio_iso.*
-%{_libdir}/kde3/kio_krarc.*
-%{_datadir}/applications/*krusader*.desktop
+%{_libdir}/kde3/kio_*.*
+%{_datadir}/applications/kde/*krusader*.desktop
 %{_datadir}/apps/konqueror/servicemenus/isoservice.desktop
 %{_datadir}/apps/krusader/
 %{_datadir}/config/kio_isorc
-%{_docdir}/HTML/en/krusader/
+%{_docdir}/HTML/*/krusader/
 %{_datadir}/icons/crystalsvg/*/apps/*
 %{_datadir}/icons/locolor/*/apps/*
 %{_mandir}/man1/krusader.1*
-%{_datadir}/services/iso.protocol
-%{_datadir}/services/krarc.protocol
+%{_datadir}/services/*.protocol
 
 %changelog
+* Fri Apr 20 2007 Marcin Garski <mgarski[AT]post.pl> 1.80.0-0.1.beta2
+- Updated to version 1.80.0-beta2
+- Drop X-Fedora category
+
 * Fri Sep 01 2006 Marcin Garski <mgarski[AT]post.pl> 1.70.1-2
 - Rebuild for Fedora Core 6
 - Spec tweak
@@ -126,7 +130,7 @@
 - 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"
+- 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/krusader/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Jul 2006 21:50:37 -0000	1.5
+++ sources	20 Apr 2007 11:35:07 -0000	1.6
@@ -1 +1 @@
-d8b33c94385fe055d55f592f0dc15c36  krusader-1.70.1.tar.gz
+2766071dea2fbf5c3abd6de8946c0a08  krusader-1.80.0-beta2.tar.gz