rpms/krusader/FC-3 krusader-1.60.0-newline.patch, NONE, 1.1 krusader-1.60.0-desktop.patch, 1.1, 1.2 krusader.spec, 1.1, 1.2

Marcin Garski (mgarski) fedora-extras-commits at redhat.com
Thu Aug 25 18:35:26 UTC 2005


Author: mgarski

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

Modified Files:
	krusader-1.60.0-desktop.patch krusader.spec 
Added Files:
	krusader-1.60.0-newline.patch 
Log Message:
* Fri 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



krusader-1.60.0-newline.patch:

--- NEW FILE krusader-1.60.0-newline.patch ---
diff -ur krusader-1.60.0-orig/krusader/DiskUsage/radialMap/map.cpp krusader-1.60.0/krusader/DiskUsage/radialMap/map.cpp
--- krusader-1.60.0-orig/krusader/DiskUsage/radialMap/map.cpp	2005-04-07 23:59:46.000000000 +0200
+++ krusader-1.60.0/krusader/DiskUsage/radialMap/map.cpp	2005-08-25 13:55:25.000000000 +0200
@@ -429,4 +429,4 @@
    }
 
 #endif
-#endif
\ Brak znaku nowej linii na końcu pliku
+#endif
diff -ur krusader-1.60.0-orig/krusader/DiskUsage/radialMap/sincos.h krusader-1.60.0/krusader/DiskUsage/radialMap/sincos.h
--- krusader-1.60.0-orig/krusader/DiskUsage/radialMap/sincos.h	2005-03-25 14:14:25.000000000 +0100
+++ krusader-1.60.0/krusader/DiskUsage/radialMap/sincos.h	2005-08-25 13:55:17.000000000 +0200
@@ -14,4 +14,4 @@
 #endif
 
 #endif
-#endif
\ Brak znaku nowej linii na końcu pliku
+#endif
diff -ur krusader-1.60.0-orig/krusader/UserAction/useractionpopupmenu.cpp krusader-1.60.0/krusader/UserAction/useractionpopupmenu.cpp
--- krusader-1.60.0-orig/krusader/UserAction/useractionpopupmenu.cpp	2004-10-11 14:01:44.000000000 +0200
+++ krusader-1.60.0/krusader/UserAction/useractionpopupmenu.cpp	2005-08-25 14:28:09.000000000 +0200
@@ -22,4 +22,4 @@
    for ( UserAction::KrActionList::iterator it = krUserAction->actionList()->begin(); it != krUserAction->actionList()->end(); ++it )
       if ( (*it)->isAvailable( currentURL ) )
          (*it)->plug( this );
-}
\ Brak znaku nowej linii na końcu pliku
+}

krusader-1.60.0-desktop.patch:

Index: krusader-1.60.0-desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/krusader/FC-3/krusader-1.60.0-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- krusader-1.60.0-desktop.patch	23 Aug 2005 16:09:51 -0000	1.1
+++ krusader-1.60.0-desktop.patch	25 Aug 2005 18:35:23 -0000	1.2
@@ -1,6 +1,6 @@
 diff -ur krusader-1.60.0-orig/krusader/krusader.desktop krusader-1.60.0/krusader/krusader.desktop
 --- krusader-1.60.0-orig/krusader/krusader.desktop	2005-01-13 00:10:48.000000000 +0100
-+++ krusader-1.60.0/krusader/krusader.desktop	2005-08-12 13:19:08.000000000 +0200
++++ krusader-1.60.0/krusader/krusader.desktop	2005-08-25 16:59:13.000000000 +0200
 @@ -3,12 +3,10 @@
  Name=Krusader
  Exec=krusader -caption "%c" %i %m  
@@ -18,8 +18,8 @@
  Comment[de]=Zwei-Fenster Dateimanager
 diff -ur krusader-1.60.0-orig/krusader/krusader_root-mode.desktop krusader-1.60.0/krusader/krusader_root-mode.desktop
 --- krusader-1.60.0-orig/krusader/krusader_root-mode.desktop	2005-01-13 00:10:48.000000000 +0100
-+++ krusader-1.60.0/krusader/krusader_root-mode.desktop	2005-08-12 13:20:11.000000000 +0200
-@@ -4,12 +4,10 @@
++++ krusader-1.60.0/krusader/krusader_root-mode.desktop	2005-08-25 17:04:30.000000000 +0200
+@@ -4,12 +4,11 @@
  Name[de]=Krusader - root-Modus
  Exec=krusader -caption "%c" %i %m  
  Icon=krusader_red.png
@@ -30,7 +30,8 @@
  DocPath=krusader/index.html
 -Categories=Qt;KDE;Utility;
 -#Categories=Qt;KDE;System;
-+Categories=Application;FileManager;Utility;Qt;KDE;
++Categories=Qt;KDE;System;
++OnlyShowIn=KDE;
  X-KDE-SubstituteUID=true
  X-KDE-Username=root
  Comment=Twin-Panel File Manager with root-privileges


Index: krusader.spec
===================================================================
RCS file: /cvs/extras/rpms/krusader/FC-3/krusader.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- krusader.spec	23 Aug 2005 16:09:51 -0000	1.1
+++ krusader.spec	25 Aug 2005 18:35:23 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		krusader
 Version:	1.60.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
@@ -9,6 +9,7 @@
 Source0:	http://prdownloads.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
@@ -34,6 +35,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -63,14 +65,12 @@
 
 %find_lang %{name}
 
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %name.lang
 %defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING CVSNEWS FAQ README TODO
+%doc doc/actions_tutorial.txt AUTHORS ChangeLog COPYING CVSNEWS FAQ README TODO
 %{_bindir}/krusader
 %{_libdir}/kde3/kio_iso.*
 %{_libdir}/kde3/kio_krarc.*
@@ -85,6 +85,13 @@
 %{_datadir}/services/krarc.protocol
 
 %changelog
+* Fri 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
 - Spec improvements for Fedora Extras
 




More information about the scm-commits mailing list