[docky] Add patch for systemd logind. New version.
Christopher Meng
cicku at fedoraproject.org
Fri Dec 13 13:42:30 UTC 2013
commit 6d46b0685ab2e74b34bd9a5fd5f74c6d6377c3f0
Author: Christopher Meng <i at cicku.me>
Date: Fri Dec 13 21:41:29 2013 +0800
Add patch for systemd logind.
New version.
.gitignore | 6 +---
1841_1840.patch | 66 +++++++++++++++++++++++++++++++++++++++++
docky.spec | 88 +++++++++++++++++++++++--------------------------------
sources | 2 +-
4 files changed, 105 insertions(+), 57 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5bc3957..8a6dad3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-/docky-2.0.7.tar.gz
-/docky-2.0.10.tar.gz
-/docky-2.0.11.tar.gz
-/docky-2.0.12.tar.gz
-/docky-2.1.4.tar.xz
+/docky-2.2.0.tar.xz
diff --git a/1841_1840.patch b/1841_1840.patch
new file mode 100644
index 0000000..7698c36
--- /dev/null
+++ b/1841_1840.patch
@@ -0,0 +1,66 @@
+=== modified file 'StandardPlugins/SessionManager/src/SystemManager.cs'
+--- StandardPlugins/SessionManager/src/SystemManager.cs 2012-12-31 04:25:57 +0000
++++ StandardPlugins/SessionManager/src/SystemManager.cs 2013-05-02 16:08:57 +0000
+@@ -86,11 +86,15 @@
+ [Interface (SystemdIface)]
+ interface ISystemd
+ {
++ string CanHibernate ();
++ string CanSuspend ();
+ string CanPowerOff ();
+ string CanReboot ();
+
+ void PowerOff (bool interactive);
+ void Reboot (bool interactive);
++ void Suspend (bool interactive);
++ void Hibernate (bool interactive);
+ }
+
+ [Interface (ConsoleKitIface)]
+@@ -212,7 +216,9 @@
+
+ public bool CanHibernate ()
+ {
+- if (upower != null)
++ if (systemd != null)
++ return String.Equals (systemd.CanHibernate (), "yes");
++ else if (upower != null)
+ return GetBoolean (upower, UPowerName, "CanHibernate") && upower.HibernateAllowed ();
+ else if (devicekit != null)
+ return GetBoolean (devicekit, DeviceKitPowerName, "CanHibernate");
+@@ -223,7 +229,10 @@
+
+ public void Hibernate ()
+ {
+- if (upower != null) {
++ if (systemd != null) {
++ if (String.Equals (systemd.CanHibernate (), "yes"))
++ systemd.Hibernate (true);
++ } else if (upower != null) {
+ if (GetBoolean (upower, UPowerName, "CanHibernate") && upower.HibernateAllowed ())
+ upower.Hibernate ();
+ } else if (devicekit != null) {
+@@ -236,7 +245,9 @@
+
+ public bool CanSuspend ()
+ {
+- if (upower != null)
++ if (systemd != null)
++ return String.Equals (systemd.CanSuspend (), "yes");
++ else if (upower != null)
+ return GetBoolean (upower, UPowerName, "CanSuspend") && upower.SuspendAllowed ();
+ else if (devicekit != null)
+ return GetBoolean (devicekit, DeviceKitPowerName, "CanSuspend");
+@@ -247,7 +258,10 @@
+
+ public void Suspend ()
+ {
+- if (upower != null) {
++ if (systemd != null) {
++ if (String.Equals (systemd.CanSuspend (), "yes"))
++ systemd.Suspend (true);
++ } else if (upower != null) {
+ if (GetBoolean (upower, UPowerName, "CanSuspend") && upower.SuspendAllowed ())
+ upower.Suspend ();
+ } else if (devicekit != null) {
+
diff --git a/docky.spec b/docky.spec
index 7e4fecd..e9e8610 100644
--- a/docky.spec
+++ b/docky.spec
@@ -1,29 +1,20 @@
+%global majorver 2.2
+%global minorver 0
%global debug_package %{nil}
Name: docky
-Version: 2.1.4
-Release: 3%{?dist}
-Summary: Advanced shortcut bar written in Mono
-
-Group: Applications/File
+Version: %{majorver}.%{minorver}
+Release: 1%{?dist}
+Summary: Advanced dock application written in Mono
License: GPLv3+
URL: http://wiki.go-docky.com
-Source0: http://launchpad.net/docky/2.1/%{version}/+download/docky-%{version}.tar.xz
-
+Source0: https://launchpad.net/docky/%{majorver}/%{version}/+download/%{name}-%{version}.tar.xz
# The "Icon Magnification" was removed from "Docky" due
# to a potential violation of US Patent 7434177
-Patch0: %{name}-nozoom.patch
-Patch1: %{name}-startscript-path.patch
-
-Requires: gnome-sharp gtk-sharp2 gnome-desktop gnome-desktop-sharp
-Requires: gnome-keyring-sharp gtk-sharp2-gapi mono-addins
-Requires: mono-core ndesk-dbus notify-sharp gtk2 GConf2
-Requires: hicolor-icon-theme
-# Docky does not use gio-sharp library yet (it has its own for now)
-Requires: gio-sharp dbus-sharp dbus-sharp-glib
-Requires: ndesk-dbus-glib
-
-# sharp deps
+Patch0: docky-nozoom.patch
+Patch1: docky-startscript-path.patch
+# Logind support checked out from upstream bzr repository
+Patch3: 1841_1840.patch
BuildRequires: gnome-sharp-devel gtk-sharp2-devel gnome-desktop-sharp-devel
BuildRequires: gnome-keyring-sharp-devel gtk-sharp2-gapi mono-addins-devel
BuildRequires: mono-devel ndesk-dbus-devel ndesk-dbus-glib-devel
@@ -37,10 +28,15 @@ BuildRequires: gettext
BuildRequires: perl-XML-Parser
BuildRequires: intltool
BuildRequires: desktop-file-utils
-
+Requires: gnome-sharp gtk-sharp2 gnome-desktop gnome-desktop-sharp
+Requires: gnome-keyring-sharp gtk-sharp2-gapi mono-addins
+Requires: mono-core ndesk-dbus notify-sharp gtk2 GConf2
+Requires: hicolor-icon-theme
+# Docky does not use gio-sharp library yet (it has its own for now)
+Requires: gio-sharp dbus-sharp dbus-sharp-glib
+Requires: ndesk-dbus-glib
# Mono only available on these:
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 %{arm} sparcv9 alpha s390x
-
+ExclusiveArch: %{ix86} x86_64 ppc ppc64 ia64 %{arm} sparcv9 alpha s390x
%description
Docky is an advanced shortcut bar that sits at the bottom, top, and/or sides
@@ -48,68 +44,61 @@ of your screen. It provides easy access to some of the files, folders,
and applications on your computer, displays which applications are
currently running, holds windows in their minimized state, and more.
-
%package devel
Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
-The %{name}-devel package contains libraries and header files
+This package contains libraries and header files
for developing applications that use %{name}.
-
%prep
%setup -q
%patch0 -p1
%patch1 -p1
-
+%patch3
%build
-%configure
+%configure --disable-schemas-install \
+ --with-gconf-schema-file-dir=%{_sysconfdir}/gconf/schemas
# do not use %{?_smp_mflags} here - LP:983001
-make
-
+make %{?_smp_mflags}
%install
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
#gapi_codegen.exe is not distributed (licence is GNU GPL v2)
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/gapi_codegen*
+rm -f %{buildroot}%{_libdir}/%{name}/gapi_codegen*
desktop-file-install \
- --dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart \
+ --dir %{buildroot}%{_sysconfdir}/xdg/autostart \
--add-only-show-in=GNOME \
- $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+ %{buildroot}%{_datadir}/applications/%{name}.desktop
desktop-file-install --delete-original \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --dir %{buildroot}%{_datadir}/applications \
--remove-category Application \
- $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+ %{buildroot}%{_datadir}/applications/%{name}.desktop
# autostart is disabled by default
echo "X-GNOME-Autostart-enabled=false" >> \
- $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/%{name}.desktop
+ %{buildroot}%{_sysconfdir}/xdg/autostart/%{name}.desktop
%find_lang %{name}
-
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
-
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
%files -f %{name}.lang
+%doc AUTHORS COPYING COPYRIGHT NEWS
%{_bindir}/%{name}
%{_libdir}/%{name}
%{_datadir}/%{name}/
@@ -119,18 +108,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/applications/*.desktop
%{_sysconfdir}/gconf/schemas/docky.schemas
%config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop
-%doc AUTHORS COPYING COPYRIGHT NEWS
-%doc %{_mandir}/man1/%{name}.1*
-
+%{_mandir}/man1/%{name}.1*
%files devel
-%{_libdir}/pkgconfig/docky.cairohelper.pc
-%{_libdir}/pkgconfig/docky.services.pc
-%{_libdir}/pkgconfig/docky.widgets.pc
-%{_libdir}/pkgconfig/docky.items.pc
-
+%{_libdir}/pkgconfig/docky.*.pc
%changelog
+* Thu Sep 19 2013 Christopher Meng <rpm at cicku.me> - 2.2.0-1
+- Update to 2.2.0(BZ#958779)
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 1598d46..be38c7b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-770fe2872dc64a0211fd9666422e6627 docky-2.1.4.tar.xz
+519fa5920a590a680afd8a87d0db9db5 docky-2.2.0.tar.xz
More information about the scm-commits
mailing list