Hello community,

here is the log from the commit of package enlightenment for openSUSE:Factory 
checked in at 2014-02-24 11:00:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/enlightenment (Old)
 and      /work/SRC/openSUSE:Factory/.enlightenment.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "enlightenment"

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

--- /dev/null   2014-02-13 01:09:38.344032506 +0100
+++ /work/SRC/openSUSE:Factory/.enlightenment.new/enlightenment.changes 
2014-02-24 11:00:15.000000000 +0100
@@ -0,0 +1,97 @@
+-------------------------------------------------------------------
+Fri Feb 21 11:43:09 UTC 2014 - [email protected]
+
+- conflicts should only be for above 0.17.3 as we obsolete older versions
+  use version 0.1 of branding to see if that fixes other complants
+
+-------------------------------------------------------------------
+Wed Feb 12 21:45:25 UTC 2014 - [email protected]
+
+- Make enlightenment-devel explicity conflict with e17-devel and 
+  provide obsoletes
+- Do the same for doc-html
+
+-------------------------------------------------------------------
+Wed Feb 12 06:26:58 UTC 2014 - [email protected]
+
+- Enlightenment now provides and obsoletes e17 >= 0.17.3
+  This should migrate 12.3 and 13.1 users to enlightenment (e18)
+  but leave 13.2 users (0.17.6) with e17
+
+-------------------------------------------------------------------
+Tue Dec 31 04:52:45 UTC 2013 - [email protected]
+
+- bump to 0.18.2
+  * Fix for lock screen
+  * Fix for excessive logging to .xsession-errors
+  * Fixed display of version info
+
+-------------------------------------------------------------------
+Tue Dec 24 03:40:59 UTC 2013 - [email protected]
+
+- Requires branding
+
+-------------------------------------------------------------------
+Tue Dec 24 03:33:15 UTC 2013 - [email protected]
+
+- Upstream branding change for terminology
+
+-------------------------------------------------------------------
+Sun Dec 22 04:12:17 UTC 2013 - [email protected]
+
+- e18.0 RELEASE !!!!!!
+ * Compositing merged into core
+   * No longer (as) optional
+   * No longer (as) buggy
+   * Wayland client support added
+   * Teamwork module added
+ * Fixed at least 10 crashes
+   * User experience while crashing improved; some users have reported over a 
200% improvement here
+ * New modules for improving desktop integration:
+   * music-control - Control your music!
+   * bluez4 - Control your bluetooth!
+   * appmenu - Control your DBus application menus!
+   * conf_comp - Control your compositor settings!
+ * Improved systemd integration
+ * Internal theme merged into Elementary
+   * Theme migration guide for themers looking to update their E17 themes to 
work with E18
+ * RandR and binding config domains have been split into separate files to 
make copying and updating easier
+ * MANY filemanager improvements
+   * udisks2 support
+   * Directory listing is now more accurate
+   * Seriously, too many improvements to name
+
+
+-------------------------------------------------------------------
+Fri Dec 20 17:42:15 UTC 2013 - [email protected]
+
+- bump to 0.18.0 pre-release
+
+-------------------------------------------------------------------
+Thu Dec 19 18:32:42 UTC 2013 - [email protected]
+
+- refresh patches
+- beutify spec a bit
+- change to pkgconfig based dependencies
+- simplify dependencies
+
+-------------------------------------------------------------------
+Thu Dec 19 16:58:34 UTC 2013 - [email protected]
+
+- buildrequire systemd-devel instead of systemd
+
+-------------------------------------------------------------------
+Fri Dec 13 23:19:11 UTC 2013 - [email protected]
+
+- bumped to 0.18.0 rc2
+
+-------------------------------------------------------------------
+Mon Dec  9 10:42:30 UTC 2013 - [email protected]
+
+- 0.18.0 RC1 full changelogs will come with the release
+
+-------------------------------------------------------------------
+Thu Nov 28 00:17:26 UTC 2013 - [email protected]
+
+- Create new enlightenment package by merging e17 from factory and nightly 
repo's
+

New:
----
  dont_offer_updates.patch
  e17
  enlightenment-0.16.999.65256-dont_require_suidbit.patch
  enlightenment-0.18.2.tar.bz2
  enlightenment.changes
  enlightenment.spec
  set_default_system_language.patch
  sysactions.conf-oS12.2

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

Other differences:
------------------
++++++ enlightenment.spec ++++++
#
# spec file for package enlightenment
#
# Copyright (c) 2010 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/
#

%define efl_version     1.8.0

%if 0%{?suse_version} >= 1230 || 0%{?fedora} >= 18
%define systemd_present 1
%else
%define systemd_present 0
%endif

%define generate_manpages 0

Name:           enlightenment
Version:        0.18.2
Release:        1
License:        BSD-2-Clause
Summary:        The window manager
Url:            http://enlightenment.org/
Group:          System/X11/Displaymanagers
Source:         %{name}-%{version}.tar.bz2
Source2:        e17
Source3:        sysactions.conf-oS12.2
# PATCH-FIX-OPENSUSE - enlightenment-0.16.999.65256-dont_require_suidbit.patch 
[email protected] -- upstream insist on having suidbit
Patch0:         enlightenment-0.16.999.65256-dont_require_suidbit.patch
# PATCH-FEATURE-OPENSUSE dont_offer_updates.patch -- don't offer updates, 
that's up to package manager -- [email protected]
Patch1:         dont_offer_updates.patch
# PATCH-FEATURE-OPENSUSE set_default_system_language.patch -- use system 
default language and don't ask user --  [email protected]
Patch2:         set_default_system_language.patch
BuildRequires:  alsa-devel
BuildRequires:  autoconf
BuildRequires:  automake
BuildRequires:  doxygen
BuildRequires:  edje >= %{efl_version}
BuildRequires:  gettext-devel
BuildRequires:  libtool
BuildRequires:  pam-devel
BuildRequires:  pkgconfig
BuildRequires:  pkgconfig(dbus-1)
BuildRequires:  pkgconfig(ecore) >= %{efl_version}
BuildRequires:  pkgconfig(ecore-con) >= %{efl_version}
BuildRequires:  pkgconfig(ecore-evas) >= %{efl_version}
BuildRequires:  pkgconfig(ecore-file) >= %{efl_version}
BuildRequires:  pkgconfig(ecore-ipc) >= %{efl_version}
BuildRequires:  pkgconfig(ecore-x) >= %{efl_version}
BuildRequires:  pkgconfig(eet) >= %{efl_version}
BuildRequires:  pkgconfig(efreet) >= %{efl_version}
BuildRequires:  pkgconfig(efreet-mime) >= %{efl_version}
BuildRequires:  pkgconfig(efreet-trash) >= %{efl_version}
BuildRequires:  pkgconfig(eina) >= %{efl_version}
BuildRequires:  pkgconfig(eio) >= %{efl_version}
BuildRequires:  pkgconfig(eldbus) >= %{efl_version}
BuildRequires:  pkgconfig(elementary) >= %{efl_version}
BuildRequires:  pkgconfig(emotion) >= %{efl_version}
BuildRequires:  pkgconfig(evas) >= %{efl_version}
BuildRequires:  pkgconfig(freetype2) >= 2.1.7
BuildRequires:  pkgconfig(xcb-keysyms)
BuildRequires:  pkgconfig(xext)
%if %systemd_present
BuildRequires:  systemd-devel
%endif
# you'll need dbus-1 for default actions set in sysactions.conf
Requires:       dbus-1

%if 0%{?suse_version} > 1100
BuildRequires:  fdupes
%endif
Requires:       edje
Requires:       efl
Requires:       evas-generic-loaders
%if 0%{?suse_version} >= 1230
%{?systemd_requires}
%endif
%if 0%{?fedora} >= 18
Requires:       systemd
%endif
%if 0%{?suse_version}
# to have working automounting we need udisks
Recommends:     udisks
%endif
Requires:               enlightenment-branding = 0.1


Provides:       e_module-notification >= 0.2.1
Obsoletes:      e_module-notification < 0.2.1
Conflicts:              e17 > 0.17.3
# lets not have users complain about theme incompat
Conflicts:              e17-theme
# Obsolete 12.3 and 13.1 users using e17.0 and e17.3 but not 13.2 users using 
e17.6 as they will
# have chosen e17 over e18 and later manually
Obsoletes:              e17 <= 0.17.3
Provides:       e17 <= 0.17.3

BuildRoot:      %{_tmppath}/%{name}-%{version}-build

%description
Enlightenment window manager and desktop environment is really fast, 
configurable and beautiful.
This package will provide the latest released version of enlightenment, as 
opposed to e16 or e17.

%package devel
Summary:        Enightenment development files
Group:          Development/Libraries/C and C++
Requires:       %{name} = %{version}
Requires:       efl-devel
Requires:       elementary-devel
Requires:       freetype2-devel >= 2.1.7
Requires:       pam-devel
Requires:       xorg-x11-libXext-devel
Requires:       pkgconfig(dbus-1)
Obsoletes:              e17-devel <= 0.17.3
Provides:       e17-devel <= 0.17.3
Conflicts:      e17-devel > 0.17.3

%description devel
Development files of Enlightenment package.

%package branding-upstream
Summary:        Enlightenment files for upstream branding
Group:          System/GUI/Other
%if 0%{?suse_version}
Supplements:    packageand(enlightenment:branding-upstream)
Conflicts:      otherproviders(e17-branding)
Conflicts:      otherproviders(enlightenment-branding)
%endif
# this uses elementary version number not enlightenment
Requires:       enlightenment-theme-upstream
Provides:       enlightenment-branding = 0.1
Conflicts:              terminology-theme-openSUSE

%description branding-upstream
Various files for Enlightenment provided by upstream but altered by openSUSE or 
Petite Linux.

%package doc-html
Summary:        HTML documentation of Enlightenment
Group:          Documentation/HTML
Conflicts:      e17-doc-html

%description doc-html
Documentation of Enlightenment in form of HTML pages.

%if %generate_manpages
%package doc-man
Summary:        Man documentation of Enlightenment
Group:          Documentation/Man

%description doc-man
Documentation of Enlightenment in form of man pages.
%endif

%prep
%setup -q
%patch0
%patch1 -p1
%patch2 -p1

%build
# fake time used for documentation
FAKE_DOCDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%a %%b %%d 
%%Y')
FAKE_DOCYEAR=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%Y')
FAKE_DOCDATETIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%a %%b 
%%d %%Y %T')
sed -i 
"s/\$datetime/$FAKE_DOCDATETIME/g;s/\$date/$FAKE_DOCDATE/g;s/\$year/$FAKEDOCYEAR/g"
 doc/*.html

%configure --disable-static --disable-silent-rules --disable-physics 
--disable-ephysics
make %{?_smp_mflags}
make doc

%install
make install DESTDIR="%{buildroot}" %{?_smp_mflags}

# copy documentation manually
echo "Copying HTML documentation"
mkdir -p %{buildroot}%{_docdir}/%{name}
/bin/cp -vr doc/html %{buildroot}%{_docdir}/%{name}

%if %generate_manpages
echo "Copying MAN pages"
/bin/cp -vr doc/man/ %{buildroot}%{_mandir}/
%endif

# remove duplicates
%if 0%{?suse_version}
%fdupes -s %{buildroot}%{_docdir}

%if %generate_manpages
%fdupes -s %{buildroot}%{_mandir}
%endif
%endif

find %{buildroot}%{_libdir} -name '*.la' -exec rm -v {} \;
%find_lang enlightenment
%if 0%{?suse_version}
%fdupes
%endif

%if 0%{?suse_version}
# remove setuid bits, enlightenment_backlight requires eeze-devel, which is not 
available for SLE
chmod -s %{buildroot}%{_libdir}/enlightenment/utils/enlightenment_sys \
%if 0%{?sles_version} != 11
         %{buildroot}%{_libdir}/enlightenment/utils/enlightenment_backlight \
%endif
         %{buildroot}%{_libdir}/enlightenment/modules/cpufreq/*/freqset
%endif

# remove duplicate files for SUSE
%if 0%{?suse_version}
%fdupes -s %{buildroot}%{_libdir}/enlightenment/modules/
%fdupes -s %{buildroot}%{_datadir}/enlightenment/data/config
%endif

# copy PAM profile
mkdir -p %{buildroot}%{_sysconfdir}/pam.d
cp %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/enlightenment
%if 0%{?suse_version} >= 1220
# replace sysactions.conf with the distribution one
cp %{SOURCE3} %{buildroot}%{_sysconfdir}/enlightenment/sysactions.conf
%endif

# remove files from not wanted place
rm %{buildroot}%{_datadir}/enlightenment/{COPYING,AUTHORS}

%if %systemd_present
%pre
%service_add_pre e18.service
%endif

%post
%if %systemd_present
%service_add_post e18.service
%endif

%if %systemd_present
%preun
%service_del_preun e18.service
%endif

%postun
%if %systemd_present
%service_del_postun e18.service
%endif

%files -f enlightenment.lang
%defattr(-,root,root)
%doc COPYING README AUTHORS
%exclude %{_docdir}/%{name}/html
%{_datadir}/xsessions/enlightenment.desktop
%{_datadir}/enlightenment/
# TBD: This package really does need a default.edj we should make sure one is 
provided
#%exclude %{_datadir}/enlightenment/data/themes/default.edj
%{_datadir}/applications/*.desktop
%{_libdir}/enlightenment
%config(noreplace) %{_sysconfdir}/enlightenment
%config(noreplace) %{_sysconfdir}/pam.d/enlightenment
%dir %{_sysconfdir}/xdg/menus
%config %{_sysconfdir}/xdg/menus/enlightenment.menu
%{_bindir}/enlightenment*
%if %systemd_present
%{_prefix}/lib/systemd/user/e18.service
%endif
# excluded to be branded
%exclude %{_libdir}/enlightenment/modules/wizard/def-ibar.txt

%files branding-upstream
%defattr(-, root, root)
%{_libdir}/enlightenment/modules/wizard/def-ibar.txt

%files devel
%defattr(-, root, root)
%{_libdir}/pkgconfig/*.pc
%{_includedir}/enlightenment

%files doc-html
%defattr(-, root, root)
%{_docdir}/%{name}
%if 0%{?centos_version} || 0%{?fedora_version} == 16
%exclude %{_docdir}/%{name}-%{version}/COPYING
%exclude %{_docdir}/%{name}-%{version}/README
%exclude %{_docdir}/%{name}-%{version}/AUTHORS
%else
%exclude %{_docdir}/%{name}/COPYING
%exclude %{_docdir}/%{name}/README
%exclude %{_docdir}/%{name}/AUTHORS
%endif

%if %generate_manpages
%files doc-man
%defattr(-, root, root)
%{_mandir}/*/*
%endif

%changelog
++++++ dont_offer_updates.patch ++++++
Index: enlightenment-0.18.0-rc2/src/modules/wizard/page_170.c
===================================================================
--- enlightenment-0.18.0-rc2.orig/src/modules/wizard/page_170.c
+++ enlightenment-0.18.0-rc2/src/modules/wizard/page_170.c
@@ -1,7 +1,7 @@
 /* Ask about updates checking */
 #include "e_wizard.h"
 
-static int do_up = 1;
+static int do_up = 0;
 /*
 EAPI int
 wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops 
__UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
@@ -58,7 +58,7 @@ wizard_page_show(E_Wizard_Page *pg)
    evas_object_show(of);
 
    e_wizard_page_show(o);
-   return 1; /* 1 == show ui, and wait for user, 0 == just continue */
+   return 0; /* 1 == show ui, and wait for user, 0 == just continue */
 }
 
 EAPI int
++++++ e17 ++++++
#%PAM-1.0
auth    required        pam_env.so      
auth    required        pam_unix.so     
account  include        common-account
password include        common-password
session  required       pam_loginuid.so
session  include        common-session
++++++ enlightenment-0.16.999.65256-dont_require_suidbit.patch ++++++
Index: src/bin/e_sys_main.c
===================================================================
--- src/bin/e_sys_main.c.orig
+++ src/bin/e_sys_main.c
@@ -127,6 +127,7 @@ main(int argc,
         printf("ERROR: MEMBER OF MORE THAN 65536 GROUPS\n");
         exit(3);
      }
+   /*
    if (setuid(0) != 0)
      {
         printf("ERROR: UNABLE TO ASSUME ROOT PRIVILEGES\n");
@@ -137,7 +138,7 @@ main(int argc,
         printf("ERROR: UNABLE TO ASSUME ROOT GROUP PRIVILEGES\n");
         exit(7);
      }
-
+   */
    eina_init();
 
    if (!auth_action_ok(action, gid, gl, gn, egid))
++++++ set_default_system_language.patch ++++++
Index: enlightenment-0.18.0-rc2/src/modules/wizard/page_010.c
===================================================================
--- enlightenment-0.18.0-rc2.orig/src/modules/wizard/page_010.c
+++ enlightenment-0.18.0-rc2/src/modules/wizard/page_010.c
@@ -202,6 +202,7 @@ wizard_page_show(E_Wizard_Page *pg)
      }
    e_widget_ilist_go(ob);
    e_widget_ilist_thaw(ob);
+   /*
    if (sel >= 0)
      {
         e_widget_ilist_selected_set(ob, sel);
@@ -210,6 +211,7 @@ wizard_page_show(E_Wizard_Page *pg)
    else if (e_widget_ilist_count(ob) == 2) // default and one other
      e_widget_ilist_selected_set(ob, 1);
    else
+   */
      e_widget_ilist_selected_set(ob, 0);
 
    e_widget_framelist_object_append(of, ob);
@@ -218,7 +220,7 @@ wizard_page_show(E_Wizard_Page *pg)
    evas_object_show(of);
    e_wizard_page_show(o);
 //   pg->data = o;
-   return 1; /* 1 == show ui, and wait for user, 0 == just continue */
+   return 0; /* 1 == show ui, and wait for user, 0 == just continue */
 }
 
 EAPI int
++++++ sysactions.conf-oS12.2 ++++++
# ENLIGHTENMENT SYSTEM ACTIONS CONFIGURATION
#
# This is a system configuration for allowing or denying certain users or
# groups to be able to do certain actions that involve system restricted
# actions such as halt, reboot, suspend, hibernate etc.
# 
# This file is read in order from top to bottom - the first rule to MATCH
# will be used for a user or a group, and nothing after that is read.
#
# You must put all the ACTION definitons BEFORE user and group rule matches.
# Any action definitons after a rule match has been found will be ignored.
# This allows actions to be re-defined for different user groups, so matches
# so the command for an action can change for matches to the rules later on.
# 
# Any user or group NOT matched by an allow or a deny will be ALLOWED to
# perform the action by default (system administrators should be aware of
# this and implement whatever policies they see fit). Generally speaking
# a user of a workstation, desktop or laptop is intended to have such abilities
# to perform these actions, thus the default of allow. For multi-user systems
# the system administrator is considered capable enough to restrict what they
# see they need to.
# 
# A WARNING to admins: do NOT allow access for users to this system remotely
# UNLESS you fully trust them or you have locked down permissions to halt/reboot
# suspend etc. here first. You have been warned.
#
# FORMAT:
#
# action:   halt           /sbin/shutdown -h now
# action:   reboot         /sbin/shutdown -r now
# action:   suspend        /etc/acpi/sleep.sh force
# action:   hibernate      /etc/acpi/hibernate.sh force
# action:   /bin/mount     /bin/mount
# action:   /bin/umount    /bin/umount
# action:   /usr/bin/eject /usr/bin/eject
# 
# user:  username  allow: halt reboot suspend hibernate
# group: groupname deny:  *
# group: *         deny:  *
# user:  *         allow: suspend
# user:  billy     allow: halt reboot
# group: staff     deny:  halt suspend hibernate
#
# etc.
#
# user and group name can use glob matches (* == all for example) like the
# shell. as can action names allowed or denied. 

action:   halt         dbus-send --print-reply=literal --system 
--dest=org.freedesktop.ConsoleKit /org/freedesktop/ConsoleKit/Manager 
org.freedesktop.ConsoleKit.Manager.Stop
action:   reboot       dbus-send --print-reply=literal --system 
--dest=org.freedesktop.ConsoleKit /org/freedesktop/ConsoleKit/Manager 
org.freedesktop.ConsoleKit.Manager.Restart
action:   suspend      dbus-send --print-reply=literal --system 
--dest=org.freedesktop.UPower /org/freedesktop/UPower 
org.freedesktop.UPower.Suspend
action:   hibernate    dbus-send --print-reply=literal --system 
--dest=org.freedesktop.UPower /org/freedesktop/UPower 
org.freedesktop.UPower.Hibernate

# We have E17 built with eeze support implementing full HAL/UDisks support so
# there is no need for this actions:
#
# action:   /bin/mount     /bin/mount
# action:   /bin/umount    /bin/umount
# action:   /usr/bin/eject /usr/bin/eject

# for openSUSE 12.2+ allow everyone everything as authorization doesn't rely on
# binary with SUID bit set
user:     *         allow:  *
-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to