Accepting request 227449 from X11:lxde

new version that obsoletes and provides lxpolkit and lxsession-edit

OBS-URL: https://build.opensuse.org/request/show/227449
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lxsession?expand=0&rev=30

lxsession-0.4.9.3-FileAttribute.Standard_Name.patch

@@ -1,34 +0,0 @@
-Index: lxsession-0.4.9.3.git20130914/lxsession-db/desktop-files-backend.vala
-===================================================================
---- lxsession-0.4.9.3.git20130914.orig/lxsession-db/desktop-files-backend.vala
-+++ lxsession-0.4.9.3.git20130914/lxsession-db/desktop-files-backend.vala
-@@ -182,7 +182,7 @@ namespace Lxsession
-             {
-                 KeyFile kf = new KeyFile();
-                 /* asynchronous call, to get directory entries */
--                var e = yield dir.enumerate_children_async (FileAttribute.STANDARD_NAME,
-+                var e = yield dir.enumerate_children_async (FILE_ATTRIBUTE_STANDARD_NAME,
-                                                             0, Priority.DEFAULT);
-                 while (true)
-                 {
-@@ -220,16 +220,16 @@ namespace Lxsession
-                         {
-                             /* No entry, just pass */;
-                         }
--                        catch (FileError err)
-+                        catch (FileError err1)
-                         {
--                            warning (err.message);
-+                            warning (err1.message);
-                         }
-                     }
-                 }
-             } 
--            catch (Error err)
-+            catch (Error err2)
-             {
--                stderr.printf ("Error: list_files failed: %s\n", err.message);
-+                stderr.printf ("Error: list_files failed: %s\n", err2.message);
-             }
-             message ("Finishing scanning\n");
- 

lxsession.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Mar 25 11:00:00 UTC 2014 - andrea@opensuse.org
+
+- provide and obsolete lxsession-edit and lxpolkit
+
+-------------------------------------------------------------------
+Thu Mar 20 19:55:45 UTC 2014 - trcs@gmx.com
+
+- Built against GKT2 to override GTK3 issues
+  * fixes theming issues
+  * avoid mixing LXDE packages built with GTK2 and GTK3
+- Removed build compatibility with discontinued versions (<= 12.2)
+  * Removed unneeded lxsession-0.4.9.3-FileAttribute.Standard_Name.patch 
+    patch
+
 -------------------------------------------------------------------
 Sat Sep 14 03:52:04 UTC 2013 - i@marguerite.su
 

lxsession.spec

@@ -30,17 +30,11 @@ Patch0:         lxsession-0.4.9.3-gtk3-fix.patch
 Patch1:         lxsession-0.4.9.3-lower-libgee.patch
 # PATCH-FIX-UPSTREAM marguerite@opensuse.org - hide_all() is no more in gtk3, replace with hide()
 Patch2:         lxsession-0.4.9.3-gtk3-hide_all.patch
-# PATCH-FIX-UPSTREAM marguerite@opensuse.org - FileAttribute.Standard_Name doesn't exist in 0.14 vala
-Patch3:         lxsession-0.4.9.3-FileAttribute.Standard_Name.patch
 BuildRequires:  dbus-1-glib-devel
 BuildRequires:  docbook-utils
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
-%if 0%{?suse_version} <= 1220
 BuildRequires:  gtk2-devel
-%else
-BuildRequires:  gtk3-devel
-%endif
 BuildRequires:  intltool
 BuildRequires:  libgee-devel
 BuildRequires:  libtool
@@ -48,6 +42,10 @@ BuildRequires:  libxslt
 BuildRequires:  pkg-config
 BuildRequires:  polkit-devel
 BuildRequires:  vala >= 0.14
+Obsoletes:		lxsession-edit <= 0.2.0
+Obsoletes:		lxpolkit <= 0.1.0
+Provides:		lxsession-edit > 0.2.0
+Provides:		lxpolkit > 0.1.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -65,16 +63,10 @@ use when a user logs out and to restart them the next time the user logs in.
 %if 0%{?suse_version} > 1220
 %patch2 -p1
 %endif
-%if 0%{?suse_version} <= 1210
-%patch3 -p1
-%endif
 
 %build
 autoreconf -fi
 %configure \
-%if 0%{?suse_version} > 1220
-	--enable-gtk3 \
-%endif
 	--enable-man
 make %{?_smp_mflags} V=1