Mailinglist Archive: opensuse-commit (926 mails)

< Previous Next >
commit lxsession-edit for openSUSE:Factory
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Mon, 21 Dec 2009 14:18:01 +0100
  • Message-id: <20091221131801.2CD97202AA@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package lxsession-edit for openSUSE:Factory
checked in at Mon Dec 21 14:18:01 CET 2009.



--------
New Changes file:

--- /dev/null 2009-09-30 08:50:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/lxsession-edit/lxsession-edit.changes
2009-12-17 01:37:58.000000000 +0100
@@ -0,0 +1,19 @@
+-------------------------------------------------------------------
+Thu Dec 17 00:31:58 UTC 2009 - andrea@xxxxxxxxxxxx
+
+- spec file clean up
+
+-------------------------------------------------------------------
+Fri Jul 17 00:31:58 UTC 2009 - andrea@xxxxxxxxxxxx
+
+- applyed patch because lxde-settings-daemon is obsoletes
+
+-------------------------------------------------------------------
+Wed Jul 08 00:31:58 UTC 2009 - andrea@xxxxxxxxxxxx
+
+- New upstream version 0.1.1
+
+-------------------------------------------------------------------
+Sat May 23 00:31:58 UTC 2009 - andrea@xxxxxxxxxxxx
+
+- new package

calling whatdependson for head-i586


New:
----
lxsession-edit-0.1.1-icon.patch
lxsession-edit-0.1.1-obsolete.patch
lxsession-edit-0.1.1.tar.bz2
lxsession-edit.changes
lxsession-edit.spec
xfwm4.png

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ lxsession-edit.spec ++++++
#
# spec file for package lxsession-edit (Version 0.1.1)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#

# norootforbuild


Name: lxsession-edit
Version: 0.1.1
Release: 1
License: GPLv3
Source0: %{name}-%version.tar.bz2
Source1: xfwm4.png
Patch0: %name-%version-icon.patch
Patch1: %name-%version-obsolete.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gtk2-devel pkgconfig
BuildRequires: python python-xml update-desktop-files
BuildRequires: autoconf automake docbook-xsl-stylesheets intltool
BuildRequires: docbook-utils fdupes hal-devel libxslt
Group: System/GUI/Other
Summary: A tool manage lxsession-lite

%description
LXSession is the default X11 session manager of LXDE.
(LXDE: Lightweight X11 Desktop Environment)
http://lxde.sourceforge.net/

lxsession-edit is a tool used to manage desktop session autostarts,
especially for lxsession lite.

%prep
%setup -q -n %name-%version
%patch0 -p1
%patch1 -p1

%build
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS"
%configure
%__make %{?jobs:-j%{jobs}}

%install
%makeinstall
#workaround to wrong brp-desktop cheks
%__install -d %buildroot/%_datadir/icons/gnome/32x32/apps/
%__cp %SOURCE1 %buildroot/%_datadir/icons/gnome/32x32/apps/
%find_lang %{name}
%suse_update_desktop_file lxsession-edit
%fdupes -s %buildroot

%clean
rm -rf "$RPM_BUILD_ROOT"

%files -f %{name}.lang
%defattr(-,root,root)
%doc README AUTHORS
%{_bindir}/lxsession-edit
%{_datadir}/applications/lxsession-edit.desktop
%dir %{_datadir}/lxsession-edit
%{_datadir}/lxsession-edit/lxsession-edit.ui
# workaround for wrong brp-desktop checks
%exclude %{_datadir}/icons/gnome/32x32/apps/xfwm4.png

%changelog
++++++ lxsession-edit-0.1.1-icon.patch ++++++
diff -uNr old-lxsession-edit-0.1.1//lxsession-edit.desktop.in
lxsession-edit-0.1.1/lxsession-edit.desktop.in
--- old-lxsession-edit-0.1.1//lxsession-edit.desktop.in 2009-06-18
05:39:43.000000000 +0200
+++ lxsession-edit-0.1.1/lxsession-edit.desktop.in 2009-07-11
12:36:32.000000000 +0200
@@ -1,12 +1,14 @@
[Desktop Entry]
Type=Application
-Icon=xfwm4.png
+Icon=/usr/share//icons/gnome/32x32/apps/xfwm4.png
Exec=lxsession-edit
Name=Desktop Session Settings
+Name[it]=Impostazioni Sessione Desktop
Name[zh_TW]=桌面工作階段設定
Name[fi]=Työpöytäistunnon asetukset
Name[ja]=デスクトップセッションの設定
Comment=Manage applications loaded in desktop session
+Comment[it]=Gestisci le applicazioni caricate durante la session
Comment[zh_TW]=管理桌面工作階段中載入的程式
Comment[fi]=Hallitse automaattisesti käynnistettäviä sovelluksia
Comment[ja]=デスクトップセッションでロードされるアプリケーションを管理します
++++++ lxsession-edit-0.1.1-obsolete.patch ++++++
diff -uNr lxsession-edit-0.1.1/src//lxsession-edit.c
lxsession-edit/src//lxsession-edit.c
--- lxsession-edit-0.1.1/src//lxsession-edit.c 2008-12-28 16:39:04.000000000
+0100
+++ lxsession-edit/src//lxsession-edit.c 2009-07-15 17:16:33.000000000
+0200
@@ -28,6 +28,8 @@
#include <stdio.h>
#include <string.h>

+#define CONFIG_FILE_NAME "desktop.conf"
+
enum {
COL_ENABLED,
COL_ICON,
@@ -46,7 +48,7 @@
ORIGINALLY_ENABLED = 1 << 15
};

-static char* session_name = "LXDE";
+static const char* session_name = NULL;
static GtkListStore* autostart_list = NULL;
static const char grp[] = "Desktop Entry";

@@ -391,6 +393,11 @@
gtk_init( &argc, &argv );
if( argc > 1 )
session_name = argv[1];
+ else
+ session_name = g_getenv("DESKTOP_SESSION");
+
+ if( G_UNLIKELY(!session_name) )
+ session_name = "LXDE";

builder = gtk_builder_new();
if( !gtk_builder_add_from_file( builder, PACKAGE_DATA_DIR
"/lxsession-edit/lxsession-edit.ui", NULL ) )
@@ -414,7 +421,7 @@
{
/* wm settings (only show this when we are under lxsession) */
kf = g_key_file_new();
- cfg = g_build_filename( g_get_user_config_dir(), "lxsession",
session_name, "config", NULL );
+ cfg = g_build_filename( g_get_user_config_dir(), "lxsession",
session_name, CONFIG_FILE_NAME, NULL );
loaded = g_key_file_load_from_file(kf, cfg, 0, NULL);
if( !loaded )
{
@@ -423,7 +430,7 @@
g_free(cfg);
for( dir = dirs; *dir; ++dir )
{
- cfg = g_build_filename( *dir, "lxsession", session_name,
"config", NULL );
+ cfg = g_build_filename( *dir, "lxsession", session_name,
CONFIG_FILE_NAME, NULL );
loaded = g_key_file_load_from_file(kf, cfg, 0, NULL);
g_free( cfg );
if( loaded )
@@ -437,7 +444,7 @@
{
g_free(wm_cmd);
/* If it's our favorite, LXDE */
- if( strcmp(g_getenv("DESKTOP_SESSION"), "LXDE") == 0 )
+ if( strcmp(session_name, "LXDE") == 0 )
wm_cmd = g_strdup("openbox-lxde");
else
wm_cmd = g_strdup("openbox");
@@ -455,12 +462,12 @@
{
save_autostart();

- if( wm ) /* if wm settin is available. */
+ if( wm ) /* if wm settings is available. */
{
char* dir;
dir = g_build_filename( g_get_user_config_dir(), "lxsession",
session_name, NULL );
g_mkdir_with_parents( dir, 0700 );
- cfg = g_build_filename( dir, "config", NULL );
+ cfg = g_build_filename( dir, "desktop.conf", NULL );
g_free( dir );
wm_cmd = (char*)gtk_entry_get_text((GtkEntry*)wm);
if( wm_cmd )

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages