[packages/galternatives] up to 0.13.5+nmu4
glen
glen at pld-linux.org
Tue Feb 2 20:25:54 CET 2016
commit e997628e015825955f1cf00c83bf774fc7c2b6ac
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Tue Feb 2 21:23:40 2016 +0200
up to 0.13.5+nmu4
galternatives-desktop.patch | 16 +++++-----------
galternatives-fedora.patch | 30 ++++++++++++++----------------
galternatives.spec | 16 +++++++++-------
3 files changed, 28 insertions(+), 34 deletions(-)
---
diff --git a/galternatives.spec b/galternatives.spec
index 8aa925a..d41ecc3 100644
--- a/galternatives.spec
+++ b/galternatives.spec
@@ -1,12 +1,11 @@
Summary: Alternatives Configurator
Name: galternatives
-Version: 0.13.4
+Version: 0.13.5
Release: 1
License: GPL+
Group: Applications/System
-#Source0: http://ftp.debian.org/debian/pool/main/g/galternatives/%{name}_%{version}.tar.gz
-Source0: http://pkgs.fedoraproject.org/repo/pkgs/galternatives/%{name}_%{version}.tar.gz/6148901a78623e85e3265a63588a2d23/galternatives_%{version}.tar.gz
-# Source0-md5: 6148901a78623e85e3265a63588a2d23
+Source0: http://ftp.debian.org/debian/pool/main/g/galternatives/%{name}_%{version}+nmu4.tar.xz
+# Source0-md5: c1ce820069b9150020a9ba85413044fa
Source1: org.fedoraproject.pkexec.run-%{name}.policy
Source2: %{name}.pamd
Source3: %{name}.sh
@@ -19,6 +18,8 @@ BuildRequires: intltool
BuildRequires: python-pygtk-glade
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.714
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
Requires: /usr/sbin/update-alternatives
Requires: polkit
Requires: python-pygtk-glade
@@ -32,9 +33,10 @@ system administrator to choose what program should provide a given
service
%prep
-%setup -q
-%patch0 -p0
-%patch1 -p0
+%setup -qc
+mv galternatives .tmp; mv .tmp/* .
+%patch0 -p1
+%patch1 -p1
# To silence rpmlint
sed -i '/^#!\%{_prefix}\/bin\/python/ d' galternatives/*.py
diff --git a/galternatives-desktop.patch b/galternatives-desktop.patch
index ff0134c..7ef1bb2 100644
--- a/galternatives-desktop.patch
+++ b/galternatives-desktop.patch
@@ -1,19 +1,13 @@
---- galternatives.desktop.in 2004-06-14 18:04:11.000000000 -0400
-+++ galternatives.desktop.in.new 2005-11-10 15:02:14.000000000 -0500
-@@ -1,13 +1,10 @@
+--- galternatives-0.13.5/galternatives.desktop.in~ 2014-06-02 16:48:20.000000000 +0300
++++ galternatives-0.13.5/galternatives.desktop.in 2016-02-02 21:16:57.793585063 +0200
+@@ -1,9 +1,8 @@
[Desktop Entry]
-Version=1.0
- Encoding=UTF-8
_Name=Alternatives Configurator
_Comment=Configure the system default alternatives
Type=Application
-Exec=/usr/sbin/galternatives
--TryExec=
--Icon=/usr/share/pixmaps/galternatives.png
--X-GNOME-DocPath=
+Exec=/usr/bin/galternatives
-+Icon=galternatives.png
+ Icon=galternatives
Terminal=false
--Categories=GTK;Application;System;
-+Categories=GTK;System;
- StartupNotify=true
+ Categories=Settings;GTK;System;
diff --git a/galternatives-fedora.patch b/galternatives-fedora.patch
index 1d8eff1..1163b9e 100644
--- a/galternatives-fedora.patch
+++ b/galternatives-fedora.patch
@@ -1,5 +1,5 @@
---- setup.py 2004-06-14 18:04:11.000000000 -0400
-+++ setup.py.new 2006-12-27 20:28:20.000000000 -0500
+--- ./setup.py 2004-06-14 18:04:11.000000000 -0400
++++ ./setup.py.new 2006-12-27 20:28:20.000000000 -0500
@@ -16,14 +16,6 @@
os.chdir ('%s/translations' % (curdir))
os.system ('./update-translations.sh')
@@ -15,8 +15,8 @@
os.chdir (curdir)
if __name__ == '__main__' :
---- galternatives/main.py 2005-08-17 21:21:04.000000000 -0400
-+++ galternatives/main.py.new 2006-12-27 22:30:19.000000000 -0500
+--- ./galternatives/main.py 2005-08-17 21:21:04.000000000 -0400
++++ ./galternatives/main.py.new 2006-12-27 22:30:19.000000000 -0500
@@ -1,8 +1,11 @@
#!/usr/bin/python
import pygtk
@@ -31,8 +31,8 @@
from common import PACKAGE
import sys, os, gettext
---- galternatives/alternative.py 2004-11-21 23:02:33.000000000 -0500
-+++ galternatives/alternative.py.new 2005-11-10 01:00:25.000000000 -0500
+--- ./galternatives/alternative.py 2004-11-21 23:02:33.000000000 -0500
++++ ./galternatives/alternative.py.new 2005-11-10 01:00:25.000000000 -0500
@@ -64,7 +64,7 @@
pass
@@ -62,9 +62,9 @@
print_debug (odict)
optslaves = []
for count in range(len (self.slaves)):
---- galternatives/main.py 2005-08-17 21:21:04.000000000 -0400
-+++ galternatives/main.py.new 2005-11-10 01:01:12.000000000 -0500
-@@ -282,8 +282,16 @@
+--- galternatives-0.13.5/galternatives/main.py~ 2016-02-02 21:17:26.000000000 +0200
++++ galternatives-0.13.5/galternatives/main.py 2016-02-02 21:20:03.389884431 +0200
+@@ -284,9 +284,15 @@
alt = self.alternative
unixname = alt.get_unixname ()
option = self.options_model.get_value (iter, self.OPTIONS)
@@ -73,14 +73,12 @@
+ for opt in alt.get_options ():
+ inits = opt['service']
-- result = os.system ('/usr/sbin/update-alternatives --set %s %s > /dev/null 2>&1' % (unixname, option))
-+ if inits == '':
-+ result = os.system ('/usr/sbin/update-alternatives --set %s %s > /dev/null 2>&1' % (unixname, option))
-+ else:
-+ result = os.system ('/usr/sbin/update-alternatives --set %s %s > /dev/null 2>&1' % (unixname, option))
-+ result2 = os.system ('/sbin/chkconfig %s on > /dev/null 2>&1' % (inits))
+ cmd = '%s --set %s %s > /dev/null 2>&1' % (UPDATE_ALTERNATIVES, unixname, option)
+ result = os.system (cmd)
++ if inits != '':
++ os.system ('/sbin/chkconfig %s on > /dev/null 2>&1' % (inits))
- print_debug ('/usr/sbin/update-alternatives --set %s %s > /dev/null 2>&1' % (unixname, option))
+ print_debug (cmd)
print_debug ('Result: %d' % (result))
@@ -347,7 +353,7 @@
text=self.SLAVEPATH)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/galternatives.git/commitdiff/f85cc0bdd42148403047104a0526da94f4eeb251
More information about the pld-cvs-commit
mailing list