up to 3.14

fedora db49a712d2789536339089a1077050c1ed033bc8

diff --git a/gpaste.spec b/gpaste.spec
index 5b8987d5aedef0eb248579b58224f934b2e58172..a3e80346764d925fd20e5d5eafa771757bcb0b8a 100644 (file)
--- a/gpaste.spec
+++ b/gpaste.spec
@@ -1,11 +1,11 @@
 Summary:       Clipboard management system
 Name:          gpaste
-Version:       3.10
+Version:       3.14
 Release:       1
 License:       GPL v3+
 Group:         X11/Applications
 Source0:       http://www.imagination-land.org/files/gpaste/%{name}-%{version}.tar.xz
-# Source0-md5: c07c89d14925508fde98eac4b069324f
+# Source0-md5: a79dd9b38ffdc50199c55ef4f8ddf9e0
 URL:           https://github.com/Keruspe/GPaste
 BuildRequires: clutter-devel
 BuildRequires: dbus-devel
@@ -19,7 +19,7 @@ BuildRequires:        gtk+3-devel
 BuildRequires: intltool
 BuildRequires: pango-devel
 BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.583
+BuildRequires: rpmbuild(macros) >= 1.673
 BuildRequires: systemd-units
 BuildRequires: tar >= 1:1.22
 BuildRequires: vala
@@ -32,9 +32,6 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                alt_name        GPaste
 
-# TODO: -lgdk missing
-%define                skip_post_check_so      libgpaste-keybinder.so.3.0.0 libgpaste-applet.so.1.0.0
-
 %description
 gpasted is a clipboard management daemon with DBus interface. gpaste
 is its CLI client and gpaste-settings is a tool to edit gpasted
@@ -61,7 +58,7 @@ developing applications that use %{name}.
 Summary:       GNOME Shell extension for GPaste
 Group:         X11/Applications
 Requires:      %{name} = %{version}-%{release}
-Requires:      gnome-shell >= 3.9.90
+Requires:      gnome-shell >= 3.14.0
 %if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
 %endif
@@ -81,7 +78,7 @@ Requires:     %{name} = %{version}-%{release}
 Summary:       Bash completion for GPaste commands
 Group:         Applications/Shells
 Requires:      %{name} = %{version}-%{release}
-Requires:      bash-completion
+Requires:      bash-completion >= 2.0
 %if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
 %endif
@@ -110,7 +107,6 @@ zsh completion for GPaste commands.
   --disable-silent-rules \
   --disable-unity \
   --enable-applet \
-  --enable-systemd \
   --enable-vala
 %{__make}
 
@@ -122,16 +118,13 @@ rm -rf $RPM_BUILD_ROOT
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # Install bash/zsh completion support
-install -d $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions
-cp -p data/completions/%{name} $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions
+install -d $RPM_BUILD_ROOT%{bash_compdir}
+cp -p data/completions/%{name} $RPM_BUILD_ROOT%{bash_compdir}
 install -d $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions
 cp -p data/completions/_%{name} $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions
 
 %find_lang %{alt_name}
 
-# Drop useless AppData file for GPaste AppIndicator
-rm $RPM_BUILD_ROOT%{_datadir}/appdata/org.gnome.GPaste.AppIndicator.appdata.xml
-
 desktop-file-validate $RPM_BUILD_ROOT%{_desktopdir}/org.gnome.GPaste.Settings.desktop
 desktop-file-validate $RPM_BUILD_ROOT%{_desktopdir}/org.gnome.GPaste.Applet.desktop
 desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/org.gnome.GPaste.Applet.desktop
@@ -154,33 +147,21 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1.*
 %dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/gpaste-daemon
 %attr(755,root,root) %{_libdir}/%{name}/gpaste-settings
 %attr(755,root,root) %{_libdir}/%{name}/gpasted
 %{_datadir}/appdata/org.gnome.GPaste.Settings.appdata.xml
 %{_desktopdir}/org.gnome.GPaste.Settings.desktop
+%{_datadir}/dbus-1/services/org.gnome.GPaste.Applet.service
+%{_datadir}/dbus-1/services/org.gnome.GPaste.Settings.service
 %{_datadir}/dbus-1/services/org.gnome.GPaste.service
 %{_datadir}/glib-2.0/schemas/org.gnome.GPaste.gschema.xml
 %{_datadir}/gnome-control-center/keybindings/*-gpaste.xml
-%{systemduserunitdir}/gpasted.service
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgpaste-applet.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgpaste-applet.so.1
-%attr(755,root,root) %{_libdir}/libgpaste-client.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgpaste-client.so.3
-%attr(755,root,root) %{_libdir}/libgpaste-core.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgpaste-core.so.4
-%attr(755,root,root) %{_libdir}/libgpaste-daemon.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgpaste-daemon.so.1
-%attr(755,root,root) %{_libdir}/libgpaste-gnome-shell-client.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgpaste-gnome-shell-client.so.0
-%attr(755,root,root) %{_libdir}/libgpaste-keybinder.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgpaste-keybinder.so.3
-%attr(755,root,root) %{_libdir}/libgpaste-settings-ui.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgpaste-settings-ui.so.2
-%attr(755,root,root) %{_libdir}/libgpaste-settings.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgpaste-settings.so.6
+%attr(755,root,root) %{_libdir}/libgpaste.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgpaste.so.2
 %{_libdir}/girepository-1.0/GPaste-1.0.typelib
 
 %files devel
@@ -189,19 +170,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/gpaste-1.0.deps
 %{_datadir}/vala/vapi/gpaste-1.0.vapi
 %{_includedir}/%{name}
-%{_libdir}/libgpaste-applet.so
-%{_libdir}/libgpaste-client.so
-%{_libdir}/libgpaste-core.so
-%{_libdir}/libgpaste-daemon.so
-%{_libdir}/libgpaste-gnome-shell-client.so
-%{_libdir}/libgpaste-keybinder.so
-%{_libdir}/libgpaste-settings-ui.so
-%{_libdir}/libgpaste-settings.so
-%{_pkgconfigdir}/gpaste-client-1.0.pc
-%{_pkgconfigdir}/gpaste-core-1.0.pc
-%{_pkgconfigdir}/gpaste-daemon-1.0.pc
-%{_pkgconfigdir}/gpaste-settings-1.0.pc
-%{_pkgconfigdir}/gpaste-settings-ui-1.0.pc
+%{_libdir}/libgpaste.so
+%{_pkgconfigdir}/gpaste-1.0.pc
 
 %files applet
 %defattr(644,root,root,755)
@@ -217,7 +187,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n bash-completion-%{name}
 %defattr(644,root,root,755)
-%{_datadir}/bash-completion/completions/%{name}
+%{bash_compdir}/%{name}
 
 %files -n zsh-completion-%{name}
 %defattr(644,root,root,755)