diff --git a/.gitignore b/.gitignore index 07f0cf8..8714ea0 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ vinagre-2.31.4.tar.bz2 /vinagre-3.13.92.tar.xz /vinagre-3.14.0.tar.xz /vinagre-3.14.1.tar.xz +/vinagre-3.14.2.tar.xz diff --git a/sources b/sources index dd1f592..39c08f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3f7e7d6ee0b57246ca1b6e52dcaea60d vinagre-3.14.1.tar.xz +b83d8c55a73433e1cab34436f7c42fd4 vinagre-3.14.2.tar.xz diff --git a/vinagre.spec b/vinagre.spec index 332289f..16d3481 100644 --- a/vinagre.spec +++ b/vinagre.spec @@ -3,43 +3,37 @@ %endif Name: vinagre -Version: 3.14.1 +Version: 3.14.2 Release: 1%{?dist} Summary: VNC client for GNOME Group: Applications/System License: GPLv2+ -URL: http://projects.gnome.org/vinagre/ +URL: https://wiki.gnome.org/Apps/Vinagre #VCS: git:git://git.gnome.org/vinagre -Source0: http://download.gnome.org/sources/vinagre/3.14/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/%{name}/3.14/%{name}-%{version}.tar.xz %if 0%{?with_spice} -BuildRequires: spice-gtk3-devel +BuildRequires: pkgconfig(spice-client-gtk-3.0) %endif -BuildRequires: gtk-vnc2-devel >= 0.4.3 -BuildRequires: glib2-devel >= 2.25.11 -BuildRequires: gtk3-devel >= 3.0.3 -BuildRequires: avahi-ui-devel >= 0.6.26 -BuildRequires: avahi-gobject-devel >= 0.6.26 -BuildRequires: gettext intltool +BuildRequires: pkgconfig(avahi-gobject) +BuildRequires: pkgconfig(avahi-ui-gtk3) +BuildRequires: pkgconfig(freerdp) +BuildRequires: pkgconfig(gio-unix-2.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(gtk-vnc-2.0) +BuildRequires: pkgconfig(libsecret-1) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(telepathy-glib) +BuildRequires: pkgconfig(vte-2.91) BuildRequires: desktop-file-utils -BuildRequires: freerdp-devel -BuildRequires: libgnome-keyring-devel -BuildRequires: telepathy-glib-devel >= 0.11.6 -BuildRequires: libxml2-devel >= 2.6.31 -BuildRequires: vte291-devel -BuildRequires: vala-devel +BuildRequires: intltool BuildRequires: itstool -BuildRequires: libsecret-devel +BuildRequires: vala-devel # for /usr/share/dbus-1/services Requires: dbus - -# for /usr/bin/xfreerdp -Requires: freerdp - -BuildRequires: automake autoconf libtool -BuildRequires: gnome-common +Requires: telepathy-filesystem # -devel package removed in 3.1.2-1 # http://git.gnome.org/browse/vinagre/commit/?id=6bb9d9fda0434e26ec7a7a8a114a96b930348a7c @@ -61,38 +55,34 @@ Apart from the VNC protocol, vinagre supports Spice and RDP. %prep %setup -q + %build -CFLAGS="%optflags -UGTK_DISABLE_DEPRECATED" %configure --enable-avahi \ - --disable-static \ - --disable-applet \ +%configure \ %if 0%{?with_spice} --enable-spice \ %endif --enable-rdp \ - --enable-ssh -make %{?_smp_mflags} + --enable-ssh \ + --with-avahi +make V=1 %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT - -# Remove text files installed by vinagre, we install them in a versioned -# directory in the files section -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/vinagre/ - -# drop unwanted stuff -rm -f $RPM_BUILD_ROOT%{_libdir}/vinagre-3.0/plugins/*.la +make install DESTDIR=%{buildroot} INSTALL="install -p" %find_lang vinagre --with-gnome + %check -desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/vinagre.desktop +make check + %post update-desktop-database &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : touch --no-create %{_datadir}/mime/packages &>/dev/null || : + %postun update-desktop-database &> /dev/null || : if [ $1 -eq 0 ]; then @@ -103,12 +93,15 @@ if [ $1 -eq 0 ]; then glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : fi + %posttrans gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : update-mime-database -n %{_datadir}/mime &>/dev/null || : glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : + %files -f vinagre.lang +%doc AUTHORS COPYING NEWS README %{_bindir}/vinagre %{_datadir}/appdata/*.appdata.xml %{_datadir}/applications/*.desktop @@ -116,20 +109,22 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_datadir}/mime/packages/vinagre-mime.xml %{_datadir}/vinagre/ %{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.Vinagre.service -%dir %{_datadir}/telepathy/ -%dir %{_datadir}/telepathy/clients/ %{_datadir}/telepathy/clients/Vinagre.client %{_datadir}/glib-2.0/schemas/org.gnome.Vinagre.gschema.xml %dir %{_datadir}/GConf/ %dir %{_datadir}/GConf/gsettings/ %{_datadir}/GConf/gsettings/org.gnome.Vinagre.convert - - %doc %{_mandir}/man1/vinagre.1.gz -%doc README NEWS COPYING AUTHORS %changelog +* Mon Nov 10 2014 David King 3.14.2-1 +- Update to 3.14.2 +- Use pkgconfig for BuildRequires +- Call "make check" in check +- Update homepage +- Preserve timestamps during install + * Mon Oct 13 2014 Kalev Lember - 3.14.1-1 - Update to 3.14.1