rpms/xfce4-panel/devel panel-htmlview.patch, NONE, 1.1 xfce4-panel.spec, 1.2, 1.3
Kevin Fenzi (kevin)
fedora-extras-commits at redhat.com
Fri Mar 25 20:15:55 UTC 2005
Author: kevin
Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11702
Modified Files:
xfce4-panel.spec
Added Files:
panel-htmlview.patch
Log Message:
Added htmlview patch
Removed unneeded la/a files
panel-htmlview.patch:
--- NEW FILE panel-htmlview.patch ---
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml xfce4-panel-4.2.1.1/contents.xml
--- xfce4-panel-4.2.1.1.orig/contents.xml 2005-03-24 20:06:17.784671961 -0700
+++ xfce4-panel-4.2.1.1/contents.xml 2005-03-24 20:08:22.042455752 -0700
@@ -41,8 +41,8 @@
<Group>
<Popup/>
<Control id="-2" popup="0">
- <Command term="0" sn="0">mozilla</Command>
- <Tooltip>Mozilla Web Browser</Tooltip>
+ <Command term="0" sn="0">htmlview</Command>
+ <Tooltip>Web Browser</Tooltip>
<Icon id="7"/>
</Control>
</Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.ar xfce4-panel-4.2.1.1/contents.xml.ar
--- xfce4-panel-4.2.1.1.orig/contents.xml.ar 2005-03-24 20:06:17.784671961 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.ar 2005-03-24 20:10:28.875841230 -0700
@@ -35,8 +35,8 @@
<Group>
<Popup/>
<Control id="-2" popup="0">
- <Command term="0" sn="0">mozilla</Command>
- <Tooltip>متصÙØ Mozilla</Tooltip>
+ <Command term="0" sn="0">htmlview</Command>
+ <Tooltip>متصÙØ</Tooltip>
<Icon id="7"/>
</Control>
</Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.az xfce4-panel-4.2.1.1/contents.xml.az
--- xfce4-panel-4.2.1.1.orig/contents.xml.az 2005-03-24 20:06:17.785671807 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.az 2005-03-24 20:10:41.511887092 -0700
@@ -35,8 +35,8 @@
<Group>
<Popup/>
<Control id="-2" popup="0">
- <Command term="0" sn="0">mozilla</Command>
- <Tooltip>Mozilla Veb Səyyahı</Tooltip>
+ <Command term="0" sn="0">htmlview</Command>
+ <Tooltip>Veb Səyyahı</Tooltip>
<Icon id="7"/>
</Control>
</Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.ca xfce4-panel-4.2.1.1/contents.xml.ca
--- xfce4-panel-4.2.1.1.orig/contents.xml.ca 2005-03-24 20:06:17.786671652 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.ca 2005-03-24 20:10:57.243454238 -0700
@@ -35,8 +35,8 @@
<Group>
<Popup/>
<Control id="-2" popup="0">
- <Command term="0" sn="0">mozilla</Command>
- <Tooltip>Navegador mozilla</Tooltip>
+ <Command term="0" sn="0">htmlview</Command>
+ <Tooltip>Navegador</Tooltip>
<Icon id="7"/>
</Control>
</Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.da xfce4-panel-4.2.1.1/contents.xml.da
--- xfce4-panel-4.2.1.1.orig/contents.xml.da 2005-03-05 04:21:43.000000000 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.da 2005-03-24 20:11:08.742675907 -0700
@@ -35,8 +35,8 @@
<Group>
<Popup/>
<Control id="-2" popup="0">
- <Command term="0" sn="0">mozilla</Command>
- <Tooltip>Mozilla Web Browser</Tooltip>
+ <Command term="0" sn="0">htmlview</Command>
+ <Tooltip>Web Browser</Tooltip>
<Icon id="7"/>
</Control>
</Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.eu xfce4-panel-4.2.1.1/contents.xml.eu
--- xfce4-panel-4.2.1.1.orig/contents.xml.eu 2005-03-24 20:06:17.786671652 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.eu 2005-03-24 20:11:21.628683112 -0700
@@ -35,8 +35,8 @@
<Group>
<Popup/>
<Control id="-2" popup="0">
- <Command term="0" sn="0">mozilla</Command>
- <Tooltip>Mozilla Web Kudeatzailea</Tooltip>
+ <Command term="0" sn="0">htmlview</Command>
+ <Tooltip>Web Kudeatzailea</Tooltip>
<Icon id="7"/>
</Control>
</Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.fi xfce4-panel-4.2.1.1/contents.xml.fi
--- xfce4-panel-4.2.1.1.orig/contents.xml.fi 2005-01-23 09:48:50.000000000 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.fi 2005-03-24 20:11:42.603439410 -0700
@@ -41,8 +41,8 @@
<Group>
<Popup/>
<Control id="-2" popup="0">
- <Command term="0" sn="0">mozilla</Command>
- <Tooltip>Mozilla Web-selain</Tooltip>
+ <Command term="0" sn="0">htmlview</Command>
+ <Tooltip>Web-selain</Tooltip>
<Icon id="7"/>
</Control>
</Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.fr xfce4-panel-4.2.1.1/contents.xml.fr
--- xfce4-panel-4.2.1.1.orig/contents.xml.fr 2005-03-24 20:06:17.787671498 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.fr 2005-03-24 20:15:07.204798232 -0700
@@ -41,8 +41,8 @@
<Group>
<Popup/>
<Control id="-2" popup="0">
- <Command term="0" sn="0">mozilla</Command>
- <Tooltip>Navigateur Web Mozilla</Tooltip>
+ <Command term="0" sn="0">htmlview</Command>
+ <Tooltip>Web</Tooltip>
<Icon id="7"/>
</Control>
</Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.he xfce4-panel-4.2.1.1/contents.xml.he
--- xfce4-panel-4.2.1.1.orig/contents.xml.he 2005-03-24 20:06:17.787671498 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.he 2005-03-24 20:12:12.065883103 -0700
@@ -35,7 +35,7 @@
<Group>
<Popup/>
<Control id="-2" popup="0">
- <Command term="0" sn="0">mozilla</Command>
+ <Command term="0" sn="0">htmlview</Command>
<Tooltip>דפדפן מוזילה</Tooltip>
<Icon id="7"/>
</Control>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.hu xfce4-panel-4.2.1.1/contents.xml.hu
--- xfce4-panel-4.2.1.1.orig/contents.xml.hu 2005-03-24 20:06:17.788671343 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.hu 2005-03-24 20:12:24.431970714 -0700
@@ -35,8 +35,8 @@
<Group>
<Popup/>
<Control id="-2" popup="0">
- <Command term="0" sn="0">mozilla</Command>
- <Tooltip>Mozilla webböngésző</Tooltip>
+ <Command term="0" sn="0">htmlview</Command>
+ <Tooltip>webböngésző</Tooltip>
<Icon id="7"/>
</Control>
</Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.it xfce4-panel-4.2.1.1/contents.xml.it
--- xfce4-panel-4.2.1.1.orig/contents.xml.it 2005-03-24 20:06:17.789671188 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.it 2005-03-24 20:12:38.720760982 -0700
@@ -35,8 +35,8 @@
<Group>
<Popup/>
<Control id="-2" popup="0">
- <Command term="0" sn="0">mozilla</Command>
- <Tooltip>Browser Web Mozilla</Tooltip>
+ <Command term="0" sn="0">htmlview</Command>
+ <Tooltip>Browser Web</Tooltip>
<Icon id="7"/>
</Control>
</Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.ja xfce4-panel-4.2.1.1/contents.xml.ja
--- xfce4-panel-4.2.1.1.orig/contents.xml.ja 2005-03-04 10:43:07.000000000 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.ja 2005-03-24 20:12:49.108154593 -0700
@@ -35,8 +35,8 @@
<Group>
<Popup/>
<Control id="-2" popup="0">
- <Command term="0" sn="0">mozilla</Command>
- <Tooltip>Mozilla ウェブブラウザを起動ã—ã¾ã™</Tooltip>
+ <Command term="0" sn="0">htmlview</Command>
+ <Tooltip>ウェブブラウザを起動ã—ã¾ã™</Tooltip>
<Icon id="7"/>
</Control>
</Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.ko xfce4-panel-4.2.1.1/contents.xml.ko
--- xfce4-panel-4.2.1.1.orig/contents.xml.ko 2005-03-24 20:06:17.789671188 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.ko 2005-03-24 20:12:55.472170411 -0700
@@ -41,7 +41,7 @@
<Group>
<Popup/>
<Control id="-2" popup="0">
- <Command term="0" sn="0">mozilla</Command>
+ <Command term="0" sn="0">htmlview</Command>
<Tooltip>ëª¨ì§ˆë¼ ì›¹ 브ë¼ìš°ì ¸</Tooltip>
<Icon id="7"/>
</Control>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.lt xfce4-panel-4.2.1.1/contents.xml.lt
--- xfce4-panel-4.2.1.1.orig/contents.xml.lt 2005-03-24 20:06:17.790671034 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.lt 2005-03-24 20:13:04.482776939 -0700
@@ -41,8 +41,8 @@
<Group>
<Popup/>
<Control id="-2" popup="0">
- <Command term="0" sn="0">mozilla</Command>
- <Tooltip>Mozilla žiniatinklio naršyklė</Tooltip>
+ <Command term="0" sn="0">htmlview</Command>
+ <Tooltip>žiniatinklio naršyklė</Tooltip>
<Icon id="7"/>
</Control>
</Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.ms xfce4-panel-4.2.1.1/contents.xml.ms
--- xfce4-panel-4.2.1.1.orig/contents.xml.ms 2005-03-24 20:06:17.791670879 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.ms 2005-03-24 20:13:12.433547369 -0700
@@ -35,8 +35,8 @@
<Group>
<Popup/>
<Control id="-2" popup="0">
- <Command term="0" sn="0">mozilla</Command>
- <Tooltip>Pelayar Web Mozilla</Tooltip>
+ <Command term="0" sn="0">htmlview</Command>
+ <Tooltip>Pelayar Web</Tooltip>
<Icon id="7"/>
</Control>
</Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.nl xfce4-panel-4.2.1.1/contents.xml.nl
--- xfce4-panel-4.2.1.1.orig/contents.xml.nl 2005-03-24 20:06:17.791670879 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.nl 2005-03-24 20:13:20.923234456 -0700
@@ -35,8 +35,8 @@
<Group>
<Popup/>
<Control id="-2" popup="0">
- <Command term="0" sn="0">mozilla</Command>
- <Tooltip>Mozilla Web Browser</Tooltip>
+ <Command term="0" sn="0">htmlview</Command>
+ <Tooltip>Web Browser</Tooltip>
<Icon id="7"/>
</Control>
</Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.ro xfce4-panel-4.2.1.1/contents.xml.ro
--- xfce4-panel-4.2.1.1.orig/contents.xml.ro 2005-03-24 20:06:17.792670724 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.ro 2005-03-24 20:13:36.617807323 -0700
@@ -41,8 +41,8 @@
<Group>
<Popup/>
<Control id="-2" popup="0">
- <Command term="0" sn="0">mozilla -splash</Command>
- <Tooltip>Navigatorul Mozilla</Tooltip>
+ <Command term="0" sn="0">htmlview</Command>
+ <Tooltip>Navigatorul</Tooltip>
<Icon id="7"/>
</Control>
</Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.ru xfce4-panel-4.2.1.1/contents.xml.ru
--- xfce4-panel-4.2.1.1.orig/contents.xml.ru 2005-03-24 20:06:17.792670724 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.ru 2005-03-24 20:13:44.978514357 -0700
@@ -35,8 +35,8 @@
<Group>
<Popup/>
<Control id="-2" popup="0">
- <Command term="0" sn="0">mozilla</Command>
- <Tooltip>Интернет-браузер Mozilla</Tooltip>
+ <Command term="0" sn="0">htmlview</Command>
+ <Tooltip>Интернет-браузер</Tooltip>
<Icon id="7"/>
</Control>
</Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.sk xfce4-panel-4.2.1.1/contents.xml.sk
--- xfce4-panel-4.2.1.1.orig/contents.xml.sk 2005-03-24 20:06:17.793670570 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.sk 2005-03-24 20:13:51.275540535 -0700
@@ -35,8 +35,8 @@
<Group>
<Popup/>
<Control id="-2" popup="0">
- <Command term="0" sn="0">mozilla</Command>
- <Tooltip>Webový prehliadaÄ Mozilla</Tooltip>
+ <Command term="0" sn="0">htmlview</Command>
+ <Tooltip>Webový prehliadaÄ</Tooltip>
<Icon id="7"/>
</Control>
</Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.tr xfce4-panel-4.2.1.1/contents.xml.tr
--- xfce4-panel-4.2.1.1.orig/contents.xml.tr 2005-03-24 20:06:17.794670415 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.tr 2005-03-24 20:14:00.384131910 -0700
@@ -35,8 +35,8 @@
<Group>
<Popup/>
<Control id="-2" popup="0">
- <Command term="0" sn="0">mozilla</Command>
- <Tooltip>Mozilla Web Tarayıcısı</Tooltip>
+ <Command term="0" sn="0">htmlview</Command>
+ <Tooltip>Web Tarayıcısı</Tooltip>
<Icon id="7"/>
</Control>
</Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.vi xfce4-panel-4.2.1.1/contents.xml.vi
--- xfce4-panel-4.2.1.1.orig/contents.xml.vi 2005-03-24 20:06:17.794670415 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.vi 2005-03-24 20:14:07.388048769 -0700
@@ -35,8 +35,8 @@
<Group>
<Popup/>
<Control id="-2" popup="0">
- <Command term="0" sn="0">mozilla</Command>
- <Tooltip>Trình duyệt web Mozilla</Tooltip>
+ <Command term="0" sn="0">htmlview</Command>
+ <Tooltip>Trình duyệt web</Tooltip>
<Icon id="7"/>
</Control>
</Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.zh_CN xfce4-panel-4.2.1.1/contents.xml.zh_CN
--- xfce4-panel-4.2.1.1.orig/contents.xml.zh_CN 2005-02-01 10:25:19.000000000 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.zh_CN 2005-03-24 20:14:19.219219103 -0700
@@ -41,8 +41,8 @@
<Group>
<Popup/>
<Control id="-2" popup="0">
- <Command term="0" sn="0">mozilla</Command>
- <Tooltip>Mozilla 网络æµè§ˆå™¨</Tooltip>
+ <Command term="0" sn="0">htmlview</Command>
+ <Tooltip>网络æµè§ˆå™¨</Tooltip>
<Icon id="7"/>
</Control>
</Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.zh_TW xfce4-panel-4.2.1.1/contents.xml.zh_TW
--- xfce4-panel-4.2.1.1.orig/contents.xml.zh_TW 2005-03-24 20:06:17.795670261 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.zh_TW 2005-03-24 20:14:29.898567563 -0700
@@ -35,8 +35,8 @@
<Group>
<Popup/>
<Control id="-2" popup="0">
- <Command term="0" sn="0">mozilla</Command>
- <Tooltip>Mozilla 網é ç€è¦½å™¨</Tooltip>
+ <Command term="0" sn="0">htmlview</Command>
+ <Tooltip>網é ç€è¦½å™¨</Tooltip>
<Icon id="7"/>
</Control>
</Group>
Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-panel.spec 20 Mar 2005 07:50:46 -0000 1.2
+++ xfce4-panel.spec 25 Mar 2005 20:15:53 -0000 1.3
@@ -1,12 +1,13 @@
Summary: Next generation panel for Xfce
Name: xfce4-panel
Version: 4.2.1.1
-Release: 2.FC4
+Release: 3.FC4
License: GPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-panel-4.2.1.1.tar.bz2
# Change default for Fedora
Patch0: panel-launchmail.patch
+Patch1: panel-htmlview.patch
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-root
Requires: libxfcegui4 >= 4.2.1
@@ -34,7 +35,8 @@
%prep
%setup -q
-%patch0 -p1
+%patch0 -p1 -b .launchmail
+%patch1 -p1 -b .htmlview
%build
%configure
@@ -42,8 +44,9 @@
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
-
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel-plugins/*.la
%find_lang %{name}
%clean
@@ -65,6 +68,10 @@
%{_includedir}/xfce4
%changelog
+* Thu Mar 24 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1.1-3.FC4
+- Added htmlview patch
+- Removed unneeded la/a files
+
* Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1.1-2
- remove stuff
More information about the fedora-extras-commits
mailing list