rpms/krusader/devel krusader.spec, 1.19, 1.20 krusader-1.80.0-gcc43-compile-fix.patch, 1.1, NONE

[Marcin Garski (mgarski)]

Author: mgarski

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

Modified Files:
	krusader.spec 
Removed Files:
	krusader-1.80.0-gcc43-compile-fix.patch 
Log Message:
- Update to 1.90.0
- Remove krusader-1.80.0-gcc43-compile-fix.patch, merged upstream



Index: krusader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krusader/devel/krusader.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- krusader.spec	14 Feb 2008 16:38:50 -0000	1.19
+++ krusader.spec	13 Apr 2008 19:46:28 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		krusader
-Version:	1.80.0
-Release:	5%{?dist}
+Version:	1.90.0
+Release:	1%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
@@ -9,8 +9,6 @@
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:		krusader-1.80.0-gcc43-compile-fix.patch
-
 BuildRequires:	kdelibs3-devel kdebase3-devel
 BuildRequires:	libpng-devel gamin-devel libacl-devel
 BuildRequires:	desktop-file-utils automake gettext
@@ -29,8 +27,6 @@
 %prep
 %setup -q
 
-%patch0 -p1
-
 %build
 unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
 
@@ -44,9 +40,19 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# Make symlink relative
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en/krusader/
-ln -sf ../common
+# Make symlink relative and remove wrong EOL
+pushd $RPM_BUILD_ROOT%{_docdir}/HTML/
+for i in *
+do
+	pushd $RPM_BUILD_ROOT%{_docdir}/HTML/$i/krusader/
+	for j in *.docbook
+	do
+		tr -d '\r' < $j > ${j}.tmp
+		mv -f ${j}.tmp $j
+	done
+	ln -sf ../common
+	popd
+done
 popd
 
 %find_lang %{name}
@@ -96,6 +102,10 @@
 %{_datadir}/services/*.protocol
 
 %changelog
+* Sun Apr 13 2008 Marcin Garski <mgarski[AT]post.pl> 1.90.0-1
+- Update to 1.90.0
+- Remove krusader-1.80.0-gcc43-compile-fix.patch, merged upstream
+
 * Thu Feb 14 2008 Marcin Garski <mgarski[AT]post.pl> 1.80.0-5
 - GCC 4.3 compile fix
 


--- krusader-1.80.0-gcc43-compile-fix.patch DELETED ---