rpms/lxde-common/devel import.log, NONE, 1.1 lxde-common-0.3.0.1-default-wallpaper.patch, NONE, 1.1 lxde-common-0.3.2.1-lxpanel-config.patch, NONE, 1.1 lxde-common-0.3.2.1-lxpanel-mixer.patch, NONE, 1.1 lxde-common-0.3.2.1-lxpanel-no-background-by-default.patch, NONE, 1.1 lxde-common-0.3.2.1-lxpanel-starthere.patch, NONE, 1.1 lxde-common-0.3.2.1-lxterminal.patch, NONE, 1.1 lxde-common-0.3.2.1-vendor-artwork.patch, NONE, 1.1 lxde-common.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/lxde-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12932/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lxde-common-0.3.0.1-default-wallpaper.patch 
	lxde-common-0.3.2.1-lxpanel-config.patch 
	lxde-common-0.3.2.1-lxpanel-mixer.patch 
	lxde-common-0.3.2.1-lxpanel-no-background-by-default.patch 
	lxde-common-0.3.2.1-lxpanel-starthere.patch 
	lxde-common-0.3.2.1-lxterminal.patch 
	lxde-common-0.3.2.1-vendor-artwork.patch lxde-common.spec 
Log Message:
Initial import of lxde-common. Review was at
https://bugzilla.redhat.com/show_bug.cgi?id=442270



--- NEW FILE import.log ---
lxde-common-0_3_2_1-3_fc10:HEAD:lxde-common-0.3.2.1-3.fc10.src.rpm:1223682569

lxde-common-0.3.0.1-default-wallpaper.patch:

--- NEW FILE lxde-common-0.3.0.1-default-wallpaper.patch ---
--- lxde-common-0.3.0.1.orig/pcmanfm/main.lxde.in	2008-03-19 07:36:29.000000000 +0100
+++ lxde-common-0.3.0.1/pcmanfm/main.lxde.in	2008-04-13 05:25:51.000000000 +0200
@@ -1,6 +1,6 @@
 [Desktop]
 show_wallpaper=1
-wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg
+wallpaper=@prefix@/share/backgrounds/images/default.png
 
 [General]
 terminal=lxterminal

lxde-common-0.3.2.1-lxpanel-config.patch:

--- NEW FILE lxde-common-0.3.2.1-lxpanel-config.patch ---
--- lxde-common-0.3.2.1.orig/lxpanel/panel.in	2008-04-20 12:09:34.000000000 +0200
+++ lxde-common-0.3.2.1/lxpanel/panel.in	2008-05-06 02:55:12.000000000 +0200
@@ -35,6 +35,7 @@
         separator {
         }
         item {
+            image=gnome-run
             command=run
         }
         separator {
@@ -50,13 +50,13 @@
     type = launchbar
     Config {
         Button {
-            id=pcmanfm.desktop
+            id=fedora-pcmanfm.desktop
         }
         Button {
             id=gnome-terminal.desktop
         }
         Button {
-            id=firefox.desktop
+            id=mozilla-firefox.desktop
         }
     }
 }

lxde-common-0.3.2.1-lxpanel-mixer.patch:

--- NEW FILE lxde-common-0.3.2.1-lxpanel-mixer.patch ---
--- lxde-common-0.3.2.1.orig/lxpanel/panel.in	2008-04-20 12:09:34.000000000 +0200
+++ lxde-common-0.3.2.1/lxpanel/panel.in	2008-05-06 02:53:22.000000000 +0200
@@ -133,3 +133,8 @@
     }
 }
 
+# Volume control
+Plugin {
+    type = volume
+}
+

lxde-common-0.3.2.1-lxpanel-no-background-by-default.patch:

--- NEW FILE lxde-common-0.3.2.1-lxpanel-no-background-by-default.patch ---
--- lxde-common-0.3.2.1.orig/lxpanel/panel.in	2008-04-20 12:09:34.000000000 +0200
+++ lxde-common-0.3.2.1/lxpanel/panel.in	2008-05-06 02:52:48.000000000 +0200
@@ -13,9 +13,9 @@
     alpha=0
     setdocktype=1
     setpartialstrut=1
-    usefontcolor=1
+    usefontcolor=0
     fontcolor=#ffffff
-    background=1
+    background=0
     backgroundfile=@prefix@/share/lxpanel/images/background.png
 }


lxde-common-0.3.2.1-lxpanel-starthere.patch:

--- NEW FILE lxde-common-0.3.2.1-lxpanel-starthere.patch ---
--- lxde-common-0.3.2.1.orig/lxpanel/panel.in	2008-04-20 12:09:34.000000000 +0200
+++ lxde-common-0.3.2.1/lxpanel/panel.in	2008-05-06 03:04:03.000000000 +0200
@@ -29,7 +29,7 @@
 Plugin {
     type = menu
     Config {
-        image=@prefix@/share/lxpanel/images/my-computer.png
+        image=@prefix@/share/icons/Fedora/24x24/places/start-here.png
         system {
         }
         separator {

lxde-common-0.3.2.1-lxterminal.patch:

--- NEW FILE lxde-common-0.3.2.1-lxterminal.patch ---
--- lxde-common-0.3.2.1.orig/lxpanel/config	2008-04-20 11:25:36.000000000 +0200
+++ lxde-common-0.3.2.1/lxpanel/config	2008-05-06 02:03:45.000000000 +0200
@@ -1,4 +1,4 @@
 [Command]
 FileManager=pcmanfm %s
-Terminal=xterm -e
+Terminal=lxterminal -e
 
--- lxde-common-0.3.2.1.orig/lxpanel/panel.in	2008-04-20 12:09:34.000000000 +0200
+++ lxde-common-0.3.2.1/lxpanel/panel.in	2008-05-06 02:11:43.000000000 +0200
@@ -53,7 +53,7 @@
             id=fedora-pcmanfm.desktop
         }
         Button {
-            id=gnome-terminal.desktop
+            id=fedora-lxterminal.desktop
         }
         Button {
             id=mozilla-firefox.desktop
--- lxde-common-0.3.2.1.orig/openbox/menu.xml   2008-04-20 10:26:09.000000000 +0200
+++ lxde-common-0.3.2.1/openbox/menu.xml        2008-05-06 02:27:12.000000000 +0200
@@ -8,8 +8,8 @@
     <startupnotify><enabled>yes</enabled><icon>pcmanfm</icon></startupnotify>
     <command>pcmanfm</command></action>
   </item>
-  <item label="Xterm">
-    <action name="Execute"><command>xterm</command></action>
+  <item label="LXTerminal">
+    <action name="Execute"><command>lxterminal</command></action>
   </item>
   <item label="Firefox">
     <action name="Execute"><command>firefox</command></action>
diff -dur lxde-common-0.3.2.1.orig/pcmanfm/main.lxde.in lxde-common-0.3.2.1/pcmanfm/main.lxde.in
--- lxde-common-0.3.2.1.orig/pcmanfm/main.lxde.in	2008-04-20 10:24:58.000000000 +0200
+++ lxde-common-0.3.2.1/pcmanfm/main.lxde.in	2008-05-06 02:13:16.000000000 +0200
@@ -1,3 +1,6 @@
 [Desktop]
 show_wallpaper=1
 wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg
+
+[General]
+terminal=lxterminal

lxde-common-0.3.2.1-vendor-artwork.patch:

--- NEW FILE lxde-common-0.3.2.1-vendor-artwork.patch ---
--- lxde-common-0.3.2.1.orig/lxde-settings/config	2008-04-20 10:26:08.000000000 +0200
+++ lxde-common-0.3.2.1/lxde-settings/config	2008-10-10 00:25:20.000000000 +0200
@@ -4,8 +4,8 @@
 #iNet/DndDragThreshold
 #iNet/CursorBlink
 #iNet/CursorBlinkTime
-sNet/ThemeName=Clearlooks
-sNet/IconThemeName=nuoveXT2
+sNet/ThemeName=Nodoka
+sNet/IconThemeName=Fedora
 #iGtk/CanChangeAccels=0
 #cGtk/ColorPalette
 sGtk/FontName=Sans 10


--- NEW FILE lxde-common.spec ---
Name:           lxde-common
Version:        0.3.2.1
Release:        3%{?dist}
Summary:        Default configuration files for LXDE
Summary(de):    Konfigurationsdateien für LXDE

Group:          User Interface/Desktops
License:        GPLv2+
URL:            http://lxde.sourceforge.net/
Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.bz2
Patch0:         %{name}-0.3.2.1-lxpanel-config.patch
Patch1:         %{name}-0.3.2.1-lxpanel-mixer.patch
Patch2:         %{name}-0.3.2.1-lxterminal.patch
Patch3:         %{name}-0.3.2.1-lxpanel-no-background-by-default.patch
# Vendor specific patches
Patch10:         %{name}-0.3.0.1-default-wallpaper.patch
Patch11:         %{name}-0.3.2.1-vendor-artwork.patch
Patch12:         %{name}-0.3.2.1-lxpanel-starthere.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  pkgconfig glib2-devel libX11-devel
Requires:       lxsession lxpanel pcmanfm openbox  
# Use vendor's artwork
Requires:       gtk-nodoka-engine fedora-icon-theme
%if 0%{?fedora} < 9
Requires:       desktop-backgrounds-basic
%else
Requires:       desktop-backgrounds-compat
%endif


%description
This package contains the configuration files for LXDE, the Lightweight X11 
Desktop Environment.

%description -l de
Dieses Paket enthält die Konfigurationsdateien für LXDE, die leichtgewichtige 
X11 Desktop Umgebung.


%prep
%setup -q
%patch0 -p1 -b .panel-config
%patch1 -p1 -b .mixer
%patch2 -p1 -b .lxterminal
%patch3 -p1 -b .no-background
%patch10 -p1 -b .default-wallpaper
%patch11 -p1 -b .vendor
%patch12 -p1 -b .starthere


%build
%configure
make %{?_smp_mflags}


%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/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%dir %{_sysconfdir}/xdg/lxsession/LXDE/
%config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/default
%config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/autostart
%config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/config

%{_bindir}/startlxde
%{_bindir}/lxde-logout
%{_bindir}/lxde-settings
%{_bindir}/openbox-lxde

%{_datadir}/lxde/
%{_datadir}/lxpanel/profile/LXDE/
%{_mandir}/man1/*.1.gz
%{_usr}/share/xsessions/LXDE.desktop


%changelog
* Fri Oct 10 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.2.1-3
- Require fedora-icon-theme and fedora-logos

* Thu Oct 09 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.2.1-2
- Rebase patches for rpm's new fuzz=0 behaviour

* Thu Jul 10 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.2.1-1
- Update to 0.3.2.1
- Switch from ROXTerm to LXterminal
- Rebased most patches
- Add mixer to the panel 

* Mon Apr 14 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.0.1-2
- Make a separate package for lxde-icon-theme

* Sat Apr 12 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.0.1-1
- Update to 0.3.0.1
- Use distros default artwork

* Sat Mar 29 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.0.0-1
- Initial Fedora RPM
- Use roxterm instead of gnome-terminal and xterm
- Patch default panel config


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Oct 2008 23:08:08 -0000	1.1
+++ .cvsignore	10 Oct 2008 23:51:57 -0000	1.2
@@ -0,0 +1 @@
+lxde-common-0.3.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Oct 2008 23:08:08 -0000	1.1
+++ sources	10 Oct 2008 23:51:57 -0000	1.2
@@ -0,0 +1 @@
+f30eee998071ace04e7be33aa8ac6a5b  lxde-common-0.3.2.1.tar.bz2