rpms/lxde-common/F-11 .cvsignore, 1.4, 1.5 lxde-common-0.4-lxde-logout.desktop.patch, 1.1, 1.2 lxde-common-0.4-lxpanel-config.patch, 1.3, 1.4 lxde-common.spec, 1.9, 1.10 sources, 1.4, 1.5
Christoph Wickert
cwickert at fedoraproject.org
Sat Jul 25 03:10:56 UTC 2009
Author: cwickert
Update of /cvs/pkgs/rpms/lxde-common/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30536
Modified Files:
.cvsignore lxde-common-0.4-lxde-logout.desktop.patch
lxde-common-0.4-lxpanel-config.patch lxde-common.spec sources
Log Message:
* Sat Jul 25 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
- Update to 0.4.2
- Disable OLPC keyboard shortcuts for now, they interfere with OpenOffice
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 20 May 2009 12:38:11 -0000 1.4
+++ .cvsignore 25 Jul 2009 03:10:53 -0000 1.5
@@ -1 +1 @@
-lxde-common-0.4.1.tar.bz2
+lxde-common-0.4.2.tar.bz2
lxde-common-0.4-lxde-logout.desktop.patch:
lxde-logout.desktop.in | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
Index: lxde-common-0.4-lxde-logout.desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/F-11/lxde-common-0.4-lxde-logout.desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lxde-common-0.4-lxde-logout.desktop.patch 13 Jun 2009 18:16:52 -0000 1.1
+++ lxde-common-0.4-lxde-logout.desktop.patch 25 Jul 2009 03:10:54 -0000 1.2
@@ -1,17 +1,18 @@
--- lxde-common-0.4.orig/lxde-logout.desktop.in 2008-11-11 10:47:06.000000000 +0100
+++ lxde-common-0.4/lxde-logout.desktop.in 2009-06-13 18:44:37.000000000 +0200
-@@ -1,9 +1,14 @@
+@@ -1,11 +1,14 @@
[Desktop Entry]
Encoding=UTF-8
+Type=Application
Name=Logout
+Name[de]=Abmelden
-+Name[fr]=Déconnexion
Name[zh_TW]=登出
Name[fi]=Kirjaudu ulos
Comment=Logout, shutdown or reboot
+Comment[de]=Abmelden, herunterfahren oder neu starten
-+Comment[fr]=Déconnexion, arrêter ou redémarrer
Comment[zh_TW]=登出、關機、或重新開機
Comment[fi]=Kirjaudu ulos, sammuta tai käynnistä tietokone uudelleen
- Icon=stock_exit
+-Icon=stock_exit
++Icon=gnome-logout
+ Exec=lxde-logout
+ NoDisplay=true
lxde-common-0.4-lxpanel-config.patch:
config | 2 +-
panel.in | 21 ++++++++++++++++-----
2 files changed, 17 insertions(+), 6 deletions(-)
Index: lxde-common-0.4-lxpanel-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/F-11/lxde-common-0.4-lxpanel-config.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- lxde-common-0.4-lxpanel-config.patch 13 Jun 2009 18:16:53 -0000 1.3
+++ lxde-common-0.4-lxpanel-config.patch 25 Jul 2009 03:10:54 -0000 1.4
@@ -27,7 +27,7 @@ diff -dur lxde-common-0.4.orig/lxpanel/p
type = menu
Config {
- image=@prefix@/share/lxde/images/lxde-icon.png
-+ image=fedora-logo-icon.png
++ image=start-here.png
system {
}
separator {
Index: lxde-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/F-11/lxde-common.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- lxde-common.spec 13 Jun 2009 21:43:17 -0000 1.9
+++ lxde-common.spec 25 Jul 2009 03:10:54 -0000 1.10
@@ -1,8 +1,8 @@
# Review: https://bugzilla.redhat.com/show_bug.cgi?id=442270
Name: lxde-common
-Version: 0.4.1
-Release: 3%{?dist}
+Version: 0.4.2
+Release: 1%{?dist}
Summary: Default configuration files for LXDE
Group: User Interface/Desktops
@@ -49,13 +49,24 @@ This package contains the configuration
Desktop Environment.
+%package -n lxde-icon-theme
+Summary: Default icon theme for LXDE
+Group: User Interface/Desktops
+License: LGPLv3
+URL: http://nuovext.pwsp.net/
+
+%description -n lxde-icon-theme
+nuoveXT is a very complete set of icons for Linux, Mac OS X and Windows. It is
+also the default icon-theme of LXDE, the Lightweight X11 Desktop Environment.
+
+
%prep
%setup -q
%patch10 -p1 -b .orig
%patch11 -p1 -b .orig
%patch12 -p1 -b .orig
%patch13 -p1 -b .logout-banner
-%patch14 -p1 -b .olpc
+#%patch14 -p1 -b .olpc
%patch4 -p1 -b .pulseaudio
%patch6 -p1 -b .desktop
%if 0%{?fedora} > 8
@@ -70,8 +81,6 @@ Desktop Environment.
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
-# the icon theme is packaged in a different package
-rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/nuoveXT2/
# only used by obsolete lxsession, not lxsession-lite
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/lxsession/LXDE/default
desktop-file-install \
@@ -86,6 +95,21 @@ desktop-file-install
rm -rf $RPM_BUILD_ROOT
+%post -n lxde-icon-theme
+touch --no-create %{_datadir}/icons/nuoveXT2 &>/dev/null || :
+
+
+%postun -n lxde-icon-theme
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/nuoveXT2 &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/nuoveXT2 &>/dev/null || :
+fi
+
+
+%posttrans -n lxde-icon-theme
+gtk-update-icon-cache %{_datadir}/icons/nuoveXT2 &>/dev/null || :
+
+
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING
@@ -101,8 +125,18 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/xsessions/LXDE.desktop
%{_datadir}/applications/lxde-*.desktop
+%files -n lxde-icon-theme
+%doc icon-theme/AUTHORS icon-theme/COPYING
+%defattr(-,root,root,-)
+%{_datadir}/icons/nuoveXT2/
+
%changelog
+* Sat Jul 25 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
+- Update to 0.4.2
+- Disable OLPC keyboard shortcuts for now, they interfere with OpenOffice
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Sat Jun 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.1-3
- Add XO keyboard shortcuts
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 20 May 2009 12:38:11 -0000 1.4
+++ sources 25 Jul 2009 03:10:54 -0000 1.5
@@ -1 +1 @@
-1d71d77d331b56ab26b0c13b709d032e lxde-common-0.4.1.tar.bz2
+81978c149ef7f349d904c4796d623ee6 lxde-common-0.4.2.tar.bz2
More information about the scm-commits
mailing list