[gpaste] Update to a newer snapshot (GNOME 3.14 support)

Mohamed ElMorabity melmorabity at fedoraproject.org
Wed Oct 8 15:58:18 UTC 2014


commit c03dea4f4e36ec17075c3e2943a0f3c62372f4b6
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date:   Wed Oct 8 17:58:02 2014 +0200

    Update to a newer snapshot (GNOME 3.14 support)

 .gitignore                          |    1 +
 gpaste-13.0-fix_appdata_files.patch |   48 -----------------------------------
 gpaste-13.0-fix_desktop_file.patch  |   23 ----------------
 gpaste.spec                         |   29 ++++++---------------
 sources                             |    2 +-
 5 files changed, 10 insertions(+), 93 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1a299c4..cc85723 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
 /gpaste-3.12.tar.xz
 /gpaste-3.12.1.tar.xz
 /GPaste-8dae0be69230217022c9d5a6e6c27ef0252ac6de.tar.gz
+/GPaste-80428a8357e9de8525123681a339a4bc8356bb31.tar.gz
diff --git a/gpaste.spec b/gpaste.spec
index a5fb9c2..ee83e1c 100644
--- a/gpaste.spec
+++ b/gpaste.spec
@@ -1,13 +1,13 @@
 %global alt_name GPaste
 
-%global commit 8dae0be69230217022c9d5a6e6c27ef0252ac6de
+%global commit 80428a8357e9de8525123681a339a4bc8356bb31
 %global short_commit %%(c=%%{commit}; echo ${c:0:7})
-%global commit_date 20140917
+%global commit_date 20140929
 %global snapshot_release %{commit_date}git%{short_commit}
 
 Name:           gpaste
 Version:        3.13
-Release:        0.1.%{snapshot_release}%{?dist}
+Release:        0.2.%{snapshot_release}%{?dist}
 Summary:        Clipboard management system
 
 Group:          User Interface/Desktops
@@ -15,15 +15,8 @@ License:        GPLv3+
 URL:            https://github.com/Keruspe/GPaste
 # Source0:        http://www.imagination-land.org/files/%%{name}/%%{name}-%%{version}.tar.xz
 Source0:        https://github.com/Keruspe/%{alt_name}/archive/%{commit}/%{alt_name}-%{commit}.tar.gz
-# Fix applet desktop file accroding to Freedesktop specifications (see
-# https://github.com/Keruspe/GPaste/issues/96)
-Patch0:         gpaste-13.0-fix_desktop_file.patch
-# Fix dead screenshot links in AppData files (see
-# https://github.com/Keruspe/GPaste/pull/99)
-Patch1:         gpaste-13.0-fix_appdata_files.patch
 
 BuildRequires:  appdata-tools
-BuildRequires:  chrpath
 BuildRequires:  desktop-file-utils
 BuildRequires:  intltool
 BuildRequires:  pkgconfig(clutter-1.0)
@@ -70,7 +63,7 @@ applications that use %{name}.
 %package -n gnome-shell-extension-%{name}
 Summary:        GNOME Shell extension for GPaste
 Group:          User Interface/Desktops
-Requires:       gnome-shell >= 3.9.90
+Requires:       gnome-shell >= 3.14.0
 Requires:       %{name} = %{version}-%{release}
 BuildArch:      noarch
 
@@ -90,8 +83,6 @@ Requires:       %{name} = %{version}-%{release}
 %prep
 # %%setup -q
 %setup -q -n %{alt_name}-%{commit}
-%patch0 -p1 -b .fix_desktop_file
-%patch1 -p1 -b .fix_appdata_files
 
 # Add missing trailing semicolon
 # sed -i "s|^NotShowIn=.*|&;|" data/desktop/org.gnome.GPaste.Applet.desktop.in.in
@@ -122,12 +113,6 @@ install -pm 0644 data/completions/_%{name} -t $RPM_BUILD_ROOT%{_datadir}/zsh/sit
 
 %find_lang %{alt_name}
 
-# Remove Rpath
-chrpath --delete \
-  $RPM_BUILD_ROOT%{_bindir}/* \
-  $RPM_BUILD_ROOT%{_libdir}/*.so.* \
-  $RPM_BUILD_ROOT%{_libexecdir}/%{name}/*
-
 
 %check
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.GPaste.Settings.desktop
@@ -152,10 +137,9 @@ fi
 
 
 %files -f %{alt_name}.lang
-%doc AUTHORS COPYING NEWS README.md THANKS TODO
+%doc AUTHORS COPYING NEWS README.md THANKS
 %{_bindir}/%{name}
 %{_libexecdir}/%{name}/
-%dir %{_datadir}/appdata
 %{_datadir}/appdata/org.gnome.GPaste.Settings.appdata.xml
 %{_datadir}/applications/org.gnome.GPaste.Settings.desktop
 %{_datadir}/dbus-1/services/*.service
@@ -192,6 +176,9 @@ fi
 
 
 %changelog
+* Tue Oct 07 2014 Mohamed El Morabity <melmorabity at fedoraproject.org> - 3.13-0.2.20140929git80428a8
+- Update to a newer snapshot (GNOME 3.14 support)
+
 * Wed Sep 24 2014 Mohamed El Morabity <melmorabity at fedoraproject.org> - 3.13-0.1.20140917git8dae0be
 - Update to a newer snapshot (GNOME 3.13.92 support)
 
diff --git a/sources b/sources
index 50459ac..4a8b484 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f864341466eb67f5c6b19bc380bc3437  GPaste-8dae0be69230217022c9d5a6e6c27ef0252ac6de.tar.gz
+388f92cbb42cf397c1275d2e02721a89  GPaste-80428a8357e9de8525123681a339a4bc8356bb31.tar.gz


More information about the scm-commits mailing list