[gksu-polkit/f17: 5/6] Add fix to service file (#975541), recreate tarball

Simone Caronni slaanesh at fedoraproject.org
Wed Jul 24 22:02:16 UTC 2013


commit 0337a65bd2a6b4f8c33a6e24b330d15152f710a1
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Wed Jul 24 23:57:36 2013 +0200

    Add fix to service file (#975541), recreate tarball

 gksu-polkit-0.0.3-policy.patch |   39 ++++++++++++++++-----------------------
 gksu-polkit.service            |    2 +-
 gksu-polkit.spec               |   30 +++++++++++++++++++++---------
 3 files changed, 38 insertions(+), 33 deletions(-)
---
diff --git a/gksu-polkit-0.0.3-policy.patch b/gksu-polkit-0.0.3-policy.patch
index fb097cf..91a5daa 100644
--- a/gksu-polkit-0.0.3-policy.patch
+++ b/gksu-polkit-0.0.3-policy.patch
@@ -1,23 +1,16 @@
-diff --git a/gksu-polkit-0.0.3-policy.patch b/gksu-polkit-0.0.3-policy.patch
-new file mode 100644
-index 0000000..d150867
---- /dev/null
-+++ b/gksu-polkit-0.0.3-policy.patch
-@@ -0,0 +1,17 @@
-+diff -ur gksu-polkit/data/org.gnome.gksu.policy gksu-polkit-0.0.3/data/org.gnome.gksu.policy
-+--- gksu-polkit/data/org.gnome.gksu.policy	2010-01-30 17:38:25.000000000 +0100
-++++ gksu-polkit-0.0.3/data/org.gnome.gksu.policy	2013-02-14 15:12:06.399148779 +0100
-+@@ -10,9 +10,9 @@
-+     <description>spawn</description>
-+     <message>System policy prevents executing a program with administration privileges</message>
-+     <defaults>
-+-      <allow_any>auth_self</allow_any>
-+-      <allow_inactive>auth_self</allow_inactive>
-+-      <allow_active>auth_self</allow_active>
-++      <allow_any>auth_admin</allow_any>
-++      <allow_inactive>auth_admin</allow_inactive>
-++      <allow_active>auth_admin</allow_active>
-+     </defaults>
-+   </action>
-+ 
-+Pouze v gksu-polkit-0.0.3/data: org.gnome.gksu.policy~
+diff -Naur gksu-polkit.old/data/org.gnome.gksu.policy gksu-polkit/data/org.gnome.gksu.policy
+--- gksu-polkit.old/data/org.gnome.gksu.policy	2013-07-21 14:42:16.039085780 +0200
++++ gksu-polkit/data/org.gnome.gksu.policy	2013-07-21 14:42:44.810774723 +0200
+@@ -10,9 +10,9 @@
+     <description>spawn</description>
+     <message>System policy prevents executing a program with administration privileges</message>
+     <defaults>
+-      <allow_any>auth_self</allow_any>
+-      <allow_inactive>auth_self</allow_inactive>
+-      <allow_active>auth_self</allow_active>
++      <allow_any>auth_admin</allow_any>
++      <allow_inactive>auth_admin</allow_inactive>
++      <allow_active>auth_admin</allow_active>
+     </defaults>
+   </action>
+ 
diff --git a/gksu-polkit.service b/gksu-polkit.service
index 2430a03..b80878c 100644
--- a/gksu-polkit.service
+++ b/gksu-polkit.service
@@ -3,5 +3,5 @@ Description=Gksu server
 
 [Service]
 Type=dbus
-BusName=org.freedesktop.Gksu
+BusName=org.gnome.Gksu
 ExecStart=/usr/sbin/gksu-server
diff --git a/gksu-polkit.spec b/gksu-polkit.spec
index b0a6ee5..355454f 100644
--- a/gksu-polkit.spec
+++ b/gksu-polkit.spec
@@ -1,22 +1,31 @@
+%define         commit f8ce834c
+
 Name:           gksu-polkit
 Version:        0.0.3
-Release:        7%{?dist}
+Release:        8.git%{commit}%{?dist}
 Summary:        Command line utility to run programs as root
 License:        LGPLv3+
 URL:            http://live.gnome.org/gksu
 
-#There is no other download source for the time being
-Source0:        http://ftp.de.debian.org/debian/pool/main/g/gksu-polkit/%{name}_%{version}.orig.tar.gz
+# There is no other download source
+Source0:        %{name}-%{version}-git%{commit}.tar.bz2
 Source1:        %{name}.service
+Source99:       %{name}-git-checkout.sh
 Patch0:         %{name}-dbus.patch
 Patch1:         %{name}-%{version}-policy.patch
 
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  doxygen
 BuildRequires:  dbus-glib-devel
+BuildRequires:  gtk-doc
 BuildRequires:  gtk2-devel
 BuildRequires:  intltool
 BuildRequires:  libgee06-devel
+BuildRequires:  libtool
 BuildRequires:  polkit-devel
 BuildRequires:  startup-notification-devel
+BuildRequires:  vala
 
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -46,14 +55,13 @@ Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Development libraries and headers for %{name}-libs.
 
 %prep
-%setup -q
+%setup -q -n %{name}
 %patch0 -p0
 %patch1 -p1
 
 %build
+autoreconf -v -f --install
 %configure
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
 %install
@@ -63,7 +71,7 @@ find %{buildroot} -name '*.a' -delete
 mkdir -p %{buildroot}/%{_unitdir}
 install -p -m 644 %{SOURCE1} %{buildroot}/%{_unitdir}/gksu.service
 
-#Currently no translations available, although we have a po folder
+# Currently no translations available, although we have a po folder
 
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
@@ -93,15 +101,19 @@ install -p -m 644 %{SOURCE1} %{buildroot}/%{_unitdir}/gksu.service
 
 %files libs
 %doc COPYING README THANKS TODO
-%{_libdir}/lib%{name}.so*
+%{_libdir}/lib%{name}.so.*
 
 %files libs-devel
-%{_datadir}/gtk-doc
 %{_includedir}/%{name}/
 %{_libdir}/lib%{name}.so
 %{_libdir}/pkgconfig/lib%{name}-1.pc
 
 %changelog
+* Sun Jul 21 2013 Simone Caronni <negativo17 at gmail.com> - 0.0.3-8.gitf8ce834c
+- Update to git snapshot, add script to recreate tarball.
+- Fix Patch1, was creating a patch file and not patching files.
+- Add fix to service file from  Jan Pokorný (#975541).
+
 * Tue Jun 11 2013 Simone Caronni <negativo17 at gmail.com> - 0.0.3-7
 - Fix systemd service file (#948613).
 - SPEC file formatting.


More information about the scm-commits mailing list