rpms/kdewebdev/devel kdewebdev-3.5.8-rename-arrow.patch, NONE, 1.1 kdewebdev.spec, 1.41, 1.42

Kevin Kofler (kkofler) fedora-extras-commits at redhat.com
Wed Dec 5 13:07:52 UTC 2007 

Author: kkofler

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

Modified Files:
	kdewebdev.spec 
Added Files:
	kdewebdev-3.5.8-rename-arrow.patch 
Log Message:
* Wed Dec 5 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:3.5.8-4
- rename arrow.png because it confuses KDE 4 (kde#153476)
- drop BR: kdesdk3 on F9+

kdewebdev-3.5.8-rename-arrow.patch:

--- NEW FILE kdewebdev-3.5.8-rename-arrow.patch ---
diff -ur kdewebdev-3.5.8/kimagemapeditor/kimagemapeditor.cpp kdewebdev-3.5.8-rename-arrow/kimagemapeditor/kimagemapeditor.cpp
--- kdewebdev-3.5.8/kimagemapeditor/kimagemapeditor.cpp	2007-01-15 12:27:30.000000000 +0100
+++ kdewebdev-3.5.8-rename-arrow/kimagemapeditor/kimagemapeditor.cpp	2007-12-05 09:00:14.000000000 +0100
@@ -565,10 +565,10 @@
 
 
   // Selection Tool
-  arrowAction=new KRadioAction(i18n("&Selection"), "arrow",
+  arrowAction=new KRadioAction(i18n("&Selection"), "arrowptr",
             0,this,SLOT (slotDrawArrow()),
       actionCollection(), "tool_arrow");
-  QMimeSourceFactory::defaultFactory()->setPixmap( "arrowimage", SmallIcon("arrow") );
+  QMimeSourceFactory::defaultFactory()->setPixmap( "arrowimage", SmallIcon("arrowptr") );
   arrowAction->setWhatsThis(i18n("<h3>Selection</h3>"
                           "Click this to select areas."));
   arrowAction->setExclusiveGroup("drawing");
diff -ur kdewebdev-3.5.8/kimagemapeditor/pics/Makefile.am kdewebdev-3.5.8-rename-arrow/kimagemapeditor/pics/Makefile.am
--- kdewebdev-3.5.8/kimagemapeditor/pics/Makefile.am	2005-09-10 10:23:17.000000000 +0200
+++ kdewebdev-3.5.8-rename-arrow/kimagemapeditor/pics/Makefile.am	2007-12-05 09:01:16.000000000 +0100
@@ -1,4 +1,4 @@
-KDE_ICON = kimagemapeditor addpoint arrow circle circle2 freehand lower polygon raise rectangle removepoint 
+KDE_ICON = kimagemapeditor addpoint arrowptr circle circle2 freehand lower polygon raise rectangle removepoint 
 
 picturesdir = $(kde_datadir)/kimagemapeditor
 pictures_DATA = addpointcursor.png freehandcursor.png polygoncursor.png removepointcursor.png
diff -ur kdewebdev-3.5.8/kimagemapeditor/pics/Makefile.in kdewebdev-3.5.8-rename-arrow/kimagemapeditor/pics/Makefile.in
--- kdewebdev-3.5.8/kimagemapeditor/pics/Makefile.in	2007-10-08 16:34:09.000000000 +0200
+++ kdewebdev-3.5.8-rename-arrow/kimagemapeditor/pics/Makefile.in	2007-12-05 09:01:41.000000000 +0100
@@ -327,7 +327,7 @@
 xdg_appsdir = @xdg_appsdir@
 xdg_directorydir = @xdg_directorydir@
 xdg_menudir = @xdg_menudir@
-KDE_ICON = kimagemapeditor addpoint arrow circle circle2 freehand lower polygon raise rectangle removepoint 
+KDE_ICON = kimagemapeditor addpoint arrowptr circle circle2 freehand lower polygon raise rectangle removepoint 
 picturesdir = $(kde_datadir)/kimagemapeditor
 pictures_DATA = addpointcursor.png freehandcursor.png polygoncursor.png removepointcursor.png
 #>- all: all-am
@@ -553,7 +553,7 @@
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=removepointcursor.png hi22-action-addpoint.png hi22-action-freehand.png polygoncursor.png hi32-app-kimagemapeditor.png addpointcursor.png lo32-app-kimagemapeditor.png Makefile.in hi22-action-removepoint.png hi22-action-lower.png hi22-action-raise.png freehandcursor.png hi48-app-kimagemapeditor.png hi22-action-rectangle.png lo16-app-kimagemapeditor.png hi22-action-arrow.png hi22-action-circle.png hi22-action-polygon.png hi22-action-circle2.png hi16-app-kimagemapeditor.png Makefile.am 
+KDE_DIST=removepointcursor.png hi22-action-addpoint.png hi22-action-freehand.png polygoncursor.png hi32-app-kimagemapeditor.png addpointcursor.png lo32-app-kimagemapeditor.png Makefile.in hi22-action-removepoint.png hi22-action-lower.png hi22-action-raise.png freehandcursor.png hi48-app-kimagemapeditor.png hi22-action-rectangle.png lo16-app-kimagemapeditor.png hi22-action-arrowptr.png hi22-action-circle.png hi22-action-polygon.png hi22-action-circle2.png hi16-app-kimagemapeditor.png Makefile.am 
 
 #>+ 2
 docs-am:
@@ -565,7 +565,7 @@
 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
 	$(INSTALL_DATA) $(srcdir)/hi48-app-kimagemapeditor.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kimagemapeditor.png
 	$(INSTALL_DATA) $(srcdir)/hi22-action-polygon.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/polygon.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-arrow.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/arrow.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-arrowptr.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/arrowptr.png
 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
 	$(INSTALL_DATA) $(srcdir)/hi32-app-kimagemapeditor.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kimagemapeditor.png
 	$(INSTALL_DATA) $(srcdir)/hi22-action-lower.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/lower.png
@@ -586,7 +586,7 @@
 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/freehand.png
 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kimagemapeditor.png
 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/polygon.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/arrow.png
+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/arrowptr.png
 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kimagemapeditor.png
 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/lower.png
 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/rectangle.png
diff -ur kdewebdev-3.5.8/kommander/editor/mainwindowactions.cpp kdewebdev-3.5.8-rename-arrow/kommander/editor/mainwindowactions.cpp
--- kdewebdev-3.5.8/kommander/editor/mainwindowactions.cpp	2007-10-08 11:50:21.000000000 +0200
+++ kdewebdev-3.5.8-rename-arrow/kommander/editor/mainwindowactions.cpp	2007-12-05 08:55:51.000000000 +0100
@@ -273,7 +273,7 @@
 
 void MainWindow::setupToolActions()
 {
-  actionPointerTool = new KToggleAction(i18n("Pointer"), "arrow", Key_F2,
+  actionPointerTool = new KToggleAction(i18n("Pointer"), "arrowptr", Key_F2,
                                         this, SLOT(toolSelected()), actionCollection(),
                                         QString::number(POINTER_TOOL).latin1());
   actionPointerTool->setToolTip(i18n("Selects the pointer tool"));


Index: kdewebdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdewebdev/devel/kdewebdev.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- kdewebdev.spec	1 Nov 2007 17:30:54 -0000	1.41
+++ kdewebdev.spec	5 Dec 2007 13:07:19 -0000	1.42
@@ -10,7 +10,7 @@
 Summary: Web development applications 
 Epoch:   6
 Version: 3.5.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Url:     http://kdewebdev.org/ 
@@ -26,12 +26,15 @@
 
 Patch0: javascript.patch
 Patch1: kdewebdev-3.5.4-kxsldbg-icons.patch
+Patch2: kdewebdev-3.5.8-rename-arrow.patch
 
 %if %{make_cvs}
 BuildRequires: automake libtool
 %endif BuildRequires: desktop-file-utils
 BuildRequires: kdelibs3-devel >= %{version}
+%if 0%{?fedora} < 9
 BuildRequires: kdesdk3-devel >= %{version}
+%endif
 BuildRequires: libxslt-devel libxml2-devel
 BuildRequires: perl
 
@@ -94,6 +97,8 @@
 %setup -q -a 1 -a 2 -a 3 -a 4
 %patch0 -p0 -b .javascript
 %patch1 -p1 -b .kxsldbg-icons
+%patch2 -p1 -b .rename-arrow
+mv -f kimagemapeditor/pics/hi22-action-arrow.png kimagemapeditor/pics/hi22-action-arrowptr.png
 
 install -m644 -p %{SOURCE5} kxsldbg/
 
@@ -210,6 +215,10 @@
 
 
 %changelog
+* Wed Dec 5 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:3.5.8-4
+- rename arrow.png because it confuses KDE 4 (kde#153476)
+- drop BR: kdesdk3 on F9+
+
 * Tue Oct 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-3
 - -libs: Obsoletes: %%name ... to help out multilib upgrades
 - -libs conditional (f8+)

More information about the fedora-extras-commits mailing list