- updated to 3.22.3 (note: new library soname)

- separated vala- interface

diff --git a/gpaste.spec b/gpaste.spec
index 48553a568ea4d387327870071e8c70a4ac943358..2be05efacd4466daf594e18f77560e3b172c5bb8 100644 (file)
--- a/gpaste.spec
+++ b/gpaste.spec
@@ -1,61 +1,95 @@
+#
+# Conditional build:
+%bcond_without gnome_shell     # GNOME Shell extension
+%bcond_with    appindicator    # Unity appindicators support
+#
 Summary:       Clipboard management system
+Summary(pl.UTF-8):     System zarządzania schowkiem
 Name:          gpaste
-Version:       3.18.1.1
+Version:       3.22.3
 Release:       1
-License:       GPL v3+
+License:       BSD
 Group:         X11/Applications
 Source0:       http://www.imagination-land.org/files/gpaste/%{name}-%{version}.tar.xz
-# Source0-md5: 2aecbfadd0eac44e2e67e0e8640e1330
+# Source0-md5: e8b55d285e1b5f3d5f75edca9935cc15
 URL:           https://github.com/Keruspe/GPaste
+BuildRequires: appstream-glib-devel
 BuildRequires: clutter-devel
 BuildRequires: dbus-devel
 BuildRequires: desktop-file-utils
-BuildRequires: gdk-pixbuf2-devel
-BuildRequires: gettext-tools
-BuildRequires: glib2-devel >= 1:2.46
-BuildRequires: gnome-control-center-devel
-BuildRequires: gobject-introspection-devel
-BuildRequires: gtk+3-devel >= 3.16
-BuildRequires: intltool
+BuildRequires: gdk-pixbuf2-devel >= 2.26.0
+BuildRequires: gettext-tools >= 0.19.7
+BuildRequires: glib2-devel >= 1:2.50
+BuildRequires: gobject-introspection-devel >= 1.50
+BuildRequires: gtk+3-devel >= 3.22
+%{?with_appindicator:BuildRequires:    libappindicator-gtk3-devel}
+%{?with_gnome_shell:BuildRequires:     mutter-devel}
 BuildRequires: pango-devel
-BuildRequires: pkgconfig
+BuildRequires: pkgconfig >= 1:0.29
 BuildRequires: rpmbuild(macros) >= 1.673
 BuildRequires: tar >= 1:1.22
-BuildRequires: vala >= 2:0.30
+BuildRequires: vala >= 2:0.32
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXi-devel
 BuildRequires: xz
 Requires:      %{name}-libs = %{version}-%{release}
-Requires:      glib2 >= 1:2.26.0
+Requires:      glib2 >= 1:2.50
 Suggests:      wgetpaste >= 2.26
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                alt_name        GPaste
-
 %description
-gpasted is a clipboard management daemon with DBus interface. gpaste
-is its CLI client and gpaste-settings is a tool to edit gpasted
-settings.
+gpasted is a clipboard management daemon with DBus interface.
+gpaste-client is its CLI client and gpaste-settings is a tool to edit
+gpasted settings.
+
+%description -l pl.UTF-8
+gpasted to demon zarządzający schowkiem przy użyciu interfejsu DBus.
+gpaste-client to klient linii poleceń, a gpaste-settings to narzędzie
+do modyfikowania ustawień.
 
 %package libs
 Summary:       Library to manage the clipboard history
+Summary(pl.UTF-8):     Biblioteka do zarządzania historią schowka
 Group:         Libraries
 
 %description libs
 libgpaste is a library to manage the clipboard history (used by
 gpasted).
 
+%description libs -l pl.UTF-8
+libgpaste to biblioteka do zarządzania historią schowka
+(wykorzystywana przez gpasted).
+
 %package devel
-Summary:       Development files for %{name}
+Summary:       Development files for libgpaste library
+Summary(pl.UTF-8):     Pliki programistyczne biblioteki libgpaste
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 
 %description devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
+This package contains the header files for developing applications
+that use libgpaste library.
+
+%description devel -l pl.UTF-8
+Ten pakiet zawiera pliki nagłówkowe do tworzenia aplikacji
+wykorzystujących bibliotekę libgpaste.
+
+%package -n vala-gpaste
+Summary:       Vala API for libgpaste library
+Summary(pl.UTF-8):     API języka Vala do biblioteki libgpaste
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+Requires:      vala >= 2:0.32
+
+%description -n vala-gpaste
+Vala API for libgpaste library.
+
+%description -n vala-gpaste -l pl.UTF-8
+API języka Vala do biblioteki libgpaste.
 
 %package -n gnome-shell-extension-%{name}
 Summary:       GNOME Shell extension for GPaste
+Summary(pl.UTF-8):     Rozszerzenie powłoki GNOME (GNOME Shell) dla GPaste
 Group:         X11/Applications
 Requires:      %{name} = %{version}-%{release}
 Requires:      gnome-shell >= 3.14.0
@@ -64,18 +98,26 @@ BuildArch:  noarch
 %endif
 
 %description -n gnome-shell-extension-%{name}
-%{summary}.
+GNOME Shell extension for GPaste.
+
+%description -n gnome-shell-extension-%{name} -l pl.UTF-8
+Rozszerzenie powłoki GNOME (GNOME Shell) dla GPaste.
 
 %package applet
 Summary:       Tray icon to manage GPaste
+Summary(pl.UTF-8):     Ikona tacki do zarządzania GPaste
 Group:         X11/Applications
 Requires:      %{name} = %{version}-%{release}
 
 %description applet
-%{summary}.
+Tray icon to manage GPaste.
+
+%description applet -l pl.UTF-8
+Ikona tacki do zarządzania GPaste.
 
 %package -n bash-completion-%{name}
 Summary:       Bash completion for GPaste commands
+Summary(pl.UTF-8):     Bashowe dopełnianie parametrów poleceń GPaste
 Group:         Applications/Shells
 Requires:      %{name} = %{version}-%{release}
 Requires:      bash-completion >= 2.0
@@ -86,8 +128,12 @@ BuildArch:  noarch
 %description -n bash-completion-%{name}
 Bash completion for GPaste commands.
 
+%description -n bash-completion-%{name} -l pl.UTF-8
+Bashowe dopełnianie parametrów poleceń GPaste.
+
 %package -n zsh-completion-%{name}
-Summary:       zsh completion for GPaste commands
+Summary:       ZSH completion for GPaste commands
+Summary(pl.UTF-8):     Dopełnianie parametrów ZSH dla poleceń GPaste
 Group:         Applications/Shells
 Requires:      %{name} = %{version}-%{release}
 %if "%{_rpmversion}" >= "5"
@@ -97,17 +143,22 @@ BuildArch: noarch
 %description -n zsh-completion-%{name}
 zsh completion for GPaste commands.
 
+%description -n zsh-completion-%{name} -l pl.UTF-8
+Dopełnianie parametrów ZSH dla poleceń GPaste.
+
 %prep
 %setup -q
 
 %build
-[ -f configure ] || NOCONFIGURE=1 ./autogen.sh
 %configure \
+       %{!?with_gnome_shell:--disable-gnome-shell-extension} \
        --disable-schemas-compile \
        --disable-silent-rules \
-       --disable-unity \
        --enable-applet \
-       --enable-vala
+       %{?with_appindicator:--enable-unity} \
+       --enable-vala \
+       --with-controlcenterdir=%{_datadir}/gnome-control-center/keybindings \
+       --with-systemduserunitdir=%{systemduserunitdir}
 %{__make}
 
 %install
@@ -115,7 +166,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm $RPM_BUILD_ROOT%{_libdir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # Install bash/zsh completion support
 install -d $RPM_BUILD_ROOT%{bash_compdir}
@@ -123,7 +174,7 @@ cp -p data/completions/gpaste-client $RPM_BUILD_ROOT%{bash_compdir}
 install -d $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions
 cp -p data/completions/_gpaste-client $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions
 
-%find_lang %{alt_name}
+%find_lang GPaste
 
 desktop-file-validate $RPM_BUILD_ROOT%{_desktopdir}/org.gnome.GPaste.Ui.desktop
 desktop-file-validate $RPM_BUILD_ROOT%{_desktopdir}/org.gnome.GPaste.Applet.desktop
@@ -141,14 +192,14 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 %glib_compile_schemas
 
-%files -f %{alt_name}.lang
+%files -f GPaste.lang
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING NEWS README.md THANKS TODO
-%attr(755,root,root) %{_bindir}/gpaste
+%doc AUTHORS COPYING ChangeLog NEWS README.md THANKS TODO
 %attr(755,root,root) %{_bindir}/gpaste-client
 %{_mandir}/man1/gpaste-client.1*
 %dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/gpaste-daemon
+%{systemduserunitdir}/org.gnome.GPaste.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
@@ -156,22 +207,27 @@ rm -rf $RPM_BUILD_ROOT
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgpaste.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgpaste.so.4
+%attr(755,root,root) %ghost %{_libdir}/libgpaste.so.6
 %{_libdir}/girepository-1.0/GPaste-1.0.typelib
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgpaste.so
 %{_datadir}/gir-1.0/GPaste-1.0.gir
-%{_datadir}/vala/vapi/gpaste-1.0.deps
-%{_datadir}/vala/vapi/gpaste-1.0.vapi
 %{_includedir}/%{name}
-%{_libdir}/libgpaste.so
 %{_pkgconfigdir}/gpaste-1.0.pc
 
+%files -n vala-gpaste
+%defattr(644,root,root,755)
+%{_datadir}/vala/vapi/gpaste-1.0.deps
+%{_datadir}/vala/vapi/gpaste-1.0.vapi
+
 %files applet
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/%{name}-applet
 %attr(755,root,root) %{_libdir}/%{name}/%{name}-ui
+%{systemduserunitdir}/org.gnome.GPaste.Applet.service
+%{systemduserunitdir}/org.gnome.GPaste.Ui.service
 %{_datadir}/appdata/org.gnome.GPaste.Applet.appdata.xml
 %{_datadir}/appdata/org.gnome.GPaste.Ui.appdata.xml
 %{_datadir}/dbus-1/services/org.gnome.GPaste.Applet.service