[gpaste/f18] Update to 2.99.1
Mohamed ElMorabity
melmorabity at fedoraproject.org
Thu Jan 17 19:58:59 UTC 2013
commit 8a5b6355bca9099be8bf1925982b0d2727982c30
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date: Thu Jan 17 20:57:41 2013 +0100
Update to 2.99.1
.gitignore | 1 +
gpaste-2.99.1-fix_gpaste-settings.patch | 62 +++++++++++++++++++++++++++++++
gpaste.spec | 46 +++++++++++++----------
sources | 2 +-
4 files changed, 90 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 643d4ca..ebccef0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
/gpaste-2.8.1.tar.xz
/gpaste-2.9.tar.xz
/gpaste-2.9.1.tar.xz
+/v2.99.1.tar.gz
diff --git a/gpaste-2.99.1-fix_gpaste-settings.patch b/gpaste-2.99.1-fix_gpaste-settings.patch
new file mode 100644
index 0000000..87a6084
--- /dev/null
+++ b/gpaste-2.99.1-fix_gpaste-settings.patch
@@ -0,0 +1,62 @@
+From 61947fa2b5ea6b19b2a9cdb7db2b328e4a703f85 Mon Sep 17 00:00:00 2001
+From: Marc-Antoine Perennou <Marc-Antoine at Perennou.com>
+Date: Tue, 15 Jan 2013 17:07:11 +0100
+Subject: [PATCH] fix gpaste-settings
+
+Signed-off-by: Marc-Antoine Perennou <Marc-Antoine at Perennou.com>
+---
+ libgpaste/settings/ui/gpaste-settings-ui-panel.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/libgpaste/settings/ui/gpaste-settings-ui-panel.c b/libgpaste/settings/ui/gpaste-settings-ui-panel.c
+index 9edb8e4..0fabcae 100644
+--- a/libgpaste/settings/ui/gpaste-settings-ui-panel.c
++++ b/libgpaste/settings/ui/gpaste-settings-ui-panel.c
+@@ -74,7 +74,7 @@ struct _GPasteSettingsUiPanelPrivate
+ boolean_wrapper (GtkToggleButton *togglebutton,
+ gpointer user_data)
+ {
+- G_PASTE_CALLBACK (GPasteBooleanCallback) (gtk_toggle_button_get_active (togglebutton), data->user_data);
++ G_PASTE_CALLBACK (GPasteBooleanCallback) (gtk_toggle_button_get_active (togglebutton), data->custom_data);
+ }
+
+ /**
+@@ -134,7 +134,7 @@ struct _GPasteSettingsUiPanelPrivate
+ range_wrapper (GtkSpinButton *spinbutton,
+ gpointer user_data)
+ {
+- G_PASTE_CALLBACK (GPasteRangeCallback) (gtk_spin_button_get_value (spinbutton), data->user_data);
++ G_PASTE_CALLBACK (GPasteRangeCallback) (gtk_spin_button_get_value (spinbutton), data->custom_data);
+ }
+
+ /**
+@@ -177,7 +177,7 @@ struct _GPasteSettingsUiPanelPrivate
+ text_wrapper (GtkEditable *editable,
+ gpointer user_data)
+ {
+- G_PASTE_CALLBACK (GPasteTextCallback) (gtk_entry_get_text (GTK_ENTRY (editable)), data->user_data);
++ G_PASTE_CALLBACK (GPasteTextCallback) (gtk_entry_get_text (GTK_ENTRY (editable)), data->custom_data);
+ }
+
+ /**
+@@ -227,7 +227,7 @@ struct _GPasteSettingsUiPanelPrivate
+ GdkEvent *event G_GNUC_UNUSED,
+ gpointer user_data)
+ {
+- G_PASTE_CALLBACK (GPasteTextCallback) (gtk_entry_get_text (GTK_ENTRY (data->user_data)), data->user_data);
++ G_PASTE_CALLBACK (GPasteTextCallback) (gtk_entry_get_text (GTK_ENTRY (data->user_data)), data->custom_data);
+ }
+
+ /**
+@@ -281,7 +281,7 @@ struct _GPasteSettingsUiPanelPrivate
+ {
+ G_PASTE_CALLBACK (GPasteMultiActionCallback) (gtk_combo_box_get_active_id (GTK_COMBO_BOX (data->user_data)),
+ gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (data->user_data2)),
+- data->user_data);
++ data->custom_data);
+ }
+
+ /**
+--
+1.7.10
+
diff --git a/gpaste.spec b/gpaste.spec
index b8b73b3..e35a7fe 100644
--- a/gpaste.spec
+++ b/gpaste.spec
@@ -1,30 +1,34 @@
%global alt_name GPaste
Name: gpaste
-Version: 2.9.1
+Version: 2.99.1
Release: 1%{?dist}
Summary: Clipboard management system
Group: User Interface/Desktops
License: GPLv3+
URL: https://github.com/Keruspe/GPaste
-Source0: https://github.com/downloads/Keruspe/%{alt_name}/%{name}-%{version}.tar.xz
+Source0: https://github.com/Keruspe/%{alt_name}/archive/v%{version}.tar.gz
+# Fix gpaste-settings (see
+# http://www.imagination-land.org/posts/2013-01-15-gpaste-2.99.1-released.html)
+Patch0: %{name}-2.99.1-fix_gpaste-settings.patch
-BuildRequires: chrpath
BuildRequires: desktop-file-utils
+BuildRequires: gobject-introspection-devel
BuildRequires: intltool
+BuildRequires: libtool
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(gdk-3.0)
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gobject-2.0)
-BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(libxml-2.0)
-BuildRequires: pkgconfig(xcb)
-BuildRequires: pkgconfig(xcb-keysyms)
-BuildRequires: pkgconfig(xcb-xtest)
+BuildRequires: pkgconfig(systemd)
+BuildRequires: pkgconfig(x11)
+BuildRequires: pkgconfig(xi)
+BuildRequires: pkgconfig(xtst)
BuildRequires: vala-tools
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -47,8 +51,8 @@ Group: Development/Libraries
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
+The %{name}-devel package contains libraries and header files for developing
+applications that use %{name}.
%package -n gnome-shell-extension-%{name}
@@ -72,14 +76,18 @@ Requires: %{name} = %{version}-%{release}
%prep
-%setup -q
+%setup -q -n %{alt_name}-%{version}
+%patch0 -p1 -b .fix-gpaste-settings
%build
+[ -f autogen.sh ] && ./autogen.sh
%configure \
--disable-schemas-compile \
--disable-silent-rules \
- --enable-applet
+ --enable-applet \
+ --enable-systemd \
+ --enable-vala
make %{?_smp_mflags}
@@ -88,11 +96,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/*.la
-# Fix Rpath issues
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/*
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so*
-chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/%{name}/*
-
# Install bash/zsh completion support
install -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/
install -pm 0644 data/completions/%{name} -t $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/
@@ -104,7 +107,7 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/
mv $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-applet.desktop $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/
# Skip validation because of AutostartCondition key
-# desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-applet.desktop
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-applet.desktop || true
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-settings.desktop
%find_lang %{alt_name}
@@ -127,16 +130,16 @@ fi
%files -f %{alt_name}.lang
-%doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
+%doc AUTHORS COPYING NEWS README.md THANKS TODO
%{_bindir}/%{name}
-%{_libexecdir}/%{name}/gpaste-settings
-%{_libexecdir}/%{name}/gpasted
+%{_libexecdir}/%{name}/
%{_datadir}/applications/%{name}-settings.desktop
%{_datadir}/dbus-1/services/*.service
%{_datadir}/glib-2.0/schemas/*.xml
%{_datadir}/zsh/
%{_mandir}/man1/%{name}.1.*
%{_sysconfdir}/bash_completion.d/
+%{_prefix}/lib/systemd/user/gpasted.service
%files libs
@@ -163,6 +166,9 @@ fi
%changelog
+* Thu Jan 17 2013 Mohamed El Morabity <melmorabity at fedoraproject.org> - 2.99.1-1
+- Update to 2.99.1
+
* Sun Dec 30 2012 Mohamed El Morabity <melmorabity at fedoraproject.org> - 2.9.1-1
- Update to 2.9.1
- Drop patch gpaste-2.9-gir.patch, fixed upstream
diff --git a/sources b/sources
index bc5ad49..e43383a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-57450a9298cb410d1dcb471c8aa73538 gpaste-2.9.1.tar.xz
+6e881cafc2098f1e03cfb0966b5a338f v2.99.1.tar.gz
More information about the scm-commits
mailing list