[gpaste] - Update to 1.5 - Remove gpaste-1.3-remove_applet_refs.patch patch (there is no more reference to

Mohamed ElMorabity melmorabity at fedoraproject.org
Wed Sep 14 08:42:01 UTC 2011


commit 43159783cab647fbad36dfd7b67b4c744d1aeec2
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date:   Wed Sep 14 10:43:24 2011 +0200

    - Update to 1.5
    - Remove gpaste-1.3-remove_applet_refs.patch patch (there is no more reference
      to the GNOME 2 applet in documentation and completion files)
    - Add gpaste-1.5-DSO.patch to fix DSO linking

 .gitignore                          |    1 +
 gpaste-1.3-remove_applet_refs.patch |   92 -----------------------------------
 gpaste-1.5-DSO.patch                |   13 +++++
 gpaste.spec                         |   15 ++++--
 sources                             |    2 +-
 5 files changed, 25 insertions(+), 98 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 000be52..c3a8e41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /gpaste-17dd47.tar.xz
 /gpaste-1.2.tar.xz
 /gpaste-1.3.tar.xz
+/gpaste-1.5.tar.xz
diff --git a/gpaste-1.5-DSO.patch b/gpaste-1.5-DSO.patch
new file mode 100644
index 0000000..a08c8f1
--- /dev/null
+++ b/gpaste-1.5-DSO.patch
@@ -0,0 +1,13 @@
+diff -up gpaste-1.5/Makefile.am.orig gpaste-1.5/Makefile.am
+--- gpaste-1.5/Makefile.am.orig	2011-09-08 20:31:49.000000000 +0200
++++ gpaste-1.5/Makefile.am	2011-09-14 09:38:20.782415617 +0200
+@@ -42,7 +42,8 @@ CLEANFILES += \
+ gpasted_LDADD = \
+ 	$(GTK_LIBS) \
+ 	$(GIO_LIBS) \
+-	$(GLIB_LIBS)
++	$(GLIB_LIBS) \
++	-lX11
+ 
+ gpaste_SOURCES = \
+ 	src/gpaste.vala
diff --git a/gpaste.spec b/gpaste.spec
index f5f54eb..63a2eb5 100644
--- a/gpaste.spec
+++ b/gpaste.spec
@@ -1,7 +1,7 @@
 %global alt_name GPaste
 
 Name:           gpaste
-Version:        1.3
+Version:        1.5
 Release:        1%{?dist}
 Summary:        Clipboard management system
 
@@ -9,9 +9,8 @@ Group:          User Interface/Desktops
 License:        GPLv3+
 URL:            https://github.com/Keruspe/GPaste
 Source0:        https://github.com/downloads/Keruspe/%{alt_name}/%{name}-%{version}.tar.xz
-# Patch to remove references to the non-used GNOME applet in documentation and
-# completion files
-Patch0:         %{name}-1.3-remove_applet_refs.patch
+# Fix DSO linking
+Patch0:         %{name}-1.5-DSO.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gtk3-devel
@@ -35,7 +34,7 @@ BuildArch:      noarch
 
 %prep
 %setup -q
-%patch0 -p1 -b .disable_applet_refs
+%patch0 -p1 -b .DSO
 
 
 %build
@@ -86,6 +85,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
 %changelog
+* Wed Sep 14 2011 Mohamed El Morabity <melmorabity at fedorapeople.org> - 1.5-1
+- Update to 1.5
+- Remove gpaste-1.3-remove_applet_refs.patch patch (there is no more reference
+  to the GNOME 2 applet in documentation and completion files)
+- Add gpaste-1.5-DSO.patch to fix DSO linking
+
 * Sat Sep 03 2011 Mohamed El Morabity <melmorabity at fedoraproject.org> - 1.3-1
 - Update to 1.3
 
diff --git a/sources b/sources
index 523e5b6..a038a75 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d13df6d46e16d5ba992b3b29436b2fbf  gpaste-1.3.tar.xz
+7052e1a672af894344f50edd12feb0d6  gpaste-1.5.tar.xz


More information about the scm-commits mailing list