Commit Graph

98 Commits

Author SHA1 Message Date
Daniel P. Berrangé
50d3aebc0c Remove trailing whitespace from RPM specfile
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2021-11-30 11:50:19 +00:00
Daniel P. Berrangé
ff5995b2fd rpm: switch to autosetup for applying patches
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2021-11-18 19:08:30 +00:00
Daniel P. Berrangé
beee9167cc rpm: add missing vte dependancy
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2021-11-18 19:08:30 +00:00
Daniel P. Berrangé
f48b17e4d0 Remove remaining traces of changelog
We intentionally stopped generating a changelog from git history in the
switch to meson, since the tiny number of people who care can just look
at the git history directly. For end users the "NEWS" file is a more
consumable record of what's changed at a high level.

The empty ChangeLog was still in git though from the autoconf days and
thus ended up in the meson generated dist. It was also still mentioned
in syntax check rules and the RPM spec.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2021-05-04 18:18:27 +01:00
Daniel P. Berrangé
dc378540ec rpm: set os-id when building for RHEL
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2021-04-26 15:01:58 +01:00
Daniel P. Berrangé
7dc64fef6b rpm: explicitly tell meson to disable spice/ovirt
%meson will force enable all features, so simply omitting the
BuildRequires is not sufficient to disable spice/ovirt. Meson
must be explicitly told to do so.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2021-04-26 10:24:23 +01:00
Daniel P. Berrangé
a511365d78 rpm: disable spice for RHEL-9
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2021-03-23 15:22:19 +00:00
Daniel P. Berrangé
2b9c9c51f8 rpm: disable govirt for RHEL-9
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2021-03-23 15:21:59 +00:00
Daniel P. Berrangé
7040dded11 icons: remove obsolete usb icon
We are now using a standard symbolic icon so don't need the custom USB
icon.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2021-03-08 12:33:06 +00:00
Daniel P. Berrangé
5400e86e4d rpm: fix passing of build-id parameter
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2021-02-15 00:12:34 +00:00
Daniel P. Berrangé
1f701aae66 rpm: convert the RPM builds over to using meson
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2021-01-25 16:02:48 +00:00
Daniel P. Berrangé
a95a5f71a7 rpm: remove obsolete desktop file script deps
This is handled automatically by RPM post-transaction.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2021-01-22 16:14:40 +00:00
Daniel P. Berrangé
0e2051ac21 rpm: remove dep on update-alternatives
This is obsolete since the removal of the spice-xpi helper

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2021-01-22 16:14:40 +00:00
Daniel P. Berrangé
d4b37dac04 rpm: don't subsititute in package name
This is always a fixed constant.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2021-01-22 16:14:40 +00:00
Daniel P. Berrangé
15cd58093a rpm: drop rule for obsleting spice-client
The old package has been gone for long enough.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2021-01-22 16:14:40 +00:00
Daniel P. Berrangé
a47eb848c1 rpm: remove conditionals for spice/ovirt/bash-completion
We can assume that we have a new enough distro for all these features.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2021-01-22 16:14:40 +00:00
Daniel P. Berrangé
db6c067c93 rpm: use https for URLs
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2021-01-22 16:14:40 +00:00
Daniel P. Berrangé
f36bd36667 rpm: remove version numbers from deps
We can assume that the distros we target have sufficiently new versions
of all our dependencies.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2021-01-22 16:14:40 +00:00
Pino Toscano
e1e345a9a3 Install the AppStream file to the canonical location
The canonical location for AppStream XML files has been changed to
/usr/share/metainfo four years ago at least, with /usr/share/appdata
left as legacy location. It is time to switch to the right location.

Signed-off-by: Pino Toscano <ptoscano@redhat.com>
2020-07-23 16:41:41 +02:00
Daniel P. Berrangé
b2afd44cab rpm: add missing rest dep to RPM spec
We get this indirectly via govirt, but since we directly use its APIs,
we should list it as an explicit dep too.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2020-06-26 15:50:50 +01:00
Daniel P. Berrangé
beeff760ac docs: update to point users to gitlab.com project
The project primary git repo has moved from pagure.io to
gitlab.com/virt-viewer/virt-viewer.  We want users to submit
code contributions, bug reports and support questions to the
gitlab project, not the mailing list, nor bugzilla, nor the
virt-manager.org site.

We're still using virt-manager.org for hosting downloads of
source and pagure.io for MSIs, but we'll aim to change that
too.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2020-04-03 14:08:10 +01:00
Michal Privoznik
898f972d53 Introduce bash completion
With this change one can get list of domains on the command line:

  $ virt-viewer -c qemu:///system <TAB><TAB>
  dom1   dom2   ... domN

The list of domains is fetched using virsh, hence the dependency
on libvirt-client recorded in the spec file. I think it's fair
to assume that Linux hosts with virt-viewer will have virsh
available too. If they don't, nothing breaks and no error message
is printed.

The completer script is inspired by libvirt.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
2019-06-19 13:42:12 +02:00
Daniel P. Berrangé
8089cddfcb po: provide custom make rules for po file management
Historically we have relied on intltool to install a standard
po/Makefile.in.in which has very limited scope for customization.
intltool is deprecated in favour of standard gettextize tools,
but these share the same disadvantages.

Writing make rules for po file management is no more difficult
than any other rules virt-viewer has, so stop using intltool
and don't use gettextize ether.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2019-03-12 11:49:38 +00:00
Daniel P. Berrangé
8e4683b00b rpm: remove obsolete Group tag purged from Fedora RPMs
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2019-03-01 17:11:36 +00:00
Andrea Bolognani
ba9c79b55e spec: Drop %{extra_release}
It was mainly meant to be used for automatic builds through
Test::AutoBuild, so it can be removed now.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
2018-11-13 10:13:25 +01:00
Daniel P. Berrangé
e8b724a777 rpm: import spec changes from fedora
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2018-07-27 17:08:34 +01:00
Eduardo Lima (Etrunko)
726db14cdb Fixes to spec file
- Use macros for paths instead of absolute paths.
- Remove dangling %{gtk_arg} macro in configure.
- Fix scope of enable_autotools macro to avoid warning during build.
  warning: Macro %enable_autotools defined but not used within scope

Signed-off-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
2017-11-23 11:51:00 -02:00
Marc-André Lureau
bf39970a1f virt-viewer.spec.in: fix build after spice-xpi-client removal
This fixes commit 140cb84c25, where we
removed the spice-xpi-client-remote-viewer.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
2017-11-17 08:39:14 +01:00
Pavel Grunt
7bc259d193 Update for README.md
It is needed to use the 'foreign' init option otherwise autotools
requires README

Fix make distcheck and spec file generation

Acked-by: Christophe Fergeau <cfergeau@redhat.com>
2017-02-07 16:58:17 +01:00
Lukáš Venhoda
f212c5a358 package: Add appdata metadata for Gnome Software
Adds metadata to be used with Gnome Software.
Includes name, summary, description and a few screenshots of remote-viewer.

Signed-off-by: Lukáš Venhoda <lvenhoda@redhat.com>
Acked-by: Daniel P. Berrange <berrange@redhat.com>
Acked-by: Fabiano Fidêncio <fidencio@redhat.com>
2016-06-29 02:01:42 +02:00
Christophe Fergeau
82589e74e6 spec: Use pkgconfig() in BuildRequires
This is better than hardcoding the name of the development package as
this will not be impacted by package renames.
2016-04-15 18:03:31 +02:00
Fabiano Fidêncio
82e13442b9 Use GResource for loading ui files
Let's take advantage of GResource for loading ui files in a better and
cleaner way than virt_viewer_util_load_ui() was doing.
It also brings the benefit, at least for developers, of being able to
test ui changes without having to "make install" virt-viewer.

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
2016-03-03 23:08:37 +01:00
Fabiano Fidêncio
51ce01dfdd Bring back libvirt-glib dependency
libvirt-glib dependency was dropped in commit 296f91c in favor to
maintain the full glib event loop integration into virt-viewer tree.
This decision was taken because libvirt-glib was not mature enough at
that time, which is not the case nowadays.

The libvirt-glib version chosen as dependency (0.1.8) is the first
release that includes the fixes for the glib event loop integration that
were backported to virt-viewer last year.

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
Acked-by: Victor Toso <victortoso@redhat.com>
2016-02-25 22:17:37 +01:00
Fabiano Fidêncio
4235ef3453 Drop support to gtk2
The 3.0 release was the last one that still supports GTK2. For the
Windows builds the support to GTK2 was dropped in the previous release.
Let's do the same for the entire project now.

Signed-off-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
2016-02-15 21:49:57 +01:00
Fabiano Fidêncio
f345d27724 specs: add remote-viewer-connect.xml
The file was introduced in commit 0571843d but never added to the spec
files.
2015-12-01 16:46:07 +01:00
Fabiano Fidêncio
d366f20180 spec: Add virt-viewer-preferences.xml
The file was introduced in commit
73b80ba99f
2015-03-12 18:09:28 +01:00
Daniel P. Berrange
acc9d72ba7 Add new ui files to the RPMs 2014-10-27 16:53:48 +00:00
Rex Dieter
862dd22362 spec: Update/optimize mime scriptlets 2014-10-23 13:47:11 +02:00
Christophe Fergeau
3232dd743b build-sys: Always prepend '-' to build id
When using the --with-buildid configure paramater, the build id which is
substituted in the MSI wxs file is automatically prepended by a '-', but
the build id which is used in the C files does not get this '-'
automatically.

Currently, the linux and mingw spec files prepend a '-' on their own to the
--with-buildid argument, but this causes the MSI installer to show 2 '-'
during installation: "Please wait while Windows configures VirtViewer
0.6.0--1"

This commit always prepends a '-' to the buildid strings, and removes the
'-' from the spec files. This is to ensure the separator between version
number and buildid is not forgotten, which could give a confusing version
number.
2014-04-04 14:49:20 +02:00
Marc-André Lureau
d33e6b1a49 Use a USB icon in the fullscreen toolbar
Replace the generic GTK_STOCK_PREFERENCES with a more appropriate USB icon.

The icon was provided by Jakub Steiner <jsteiner@redhat.com>

https://bugzilla.redhat.com/show_bug.cgi?id=804184
2014-03-13 12:57:14 +01:00
Christophe Fergeau
8f0dd93e8f spec: Don't disable spice support on some archs
Nowadays spice-gtk no longer has an ExclusiveArch: x86 x86_64 %{arm}
virt-viewer can be built with spice-gtk support on all arches.
2014-02-27 10:06:40 +01:00
Christophe Fergeau
71eac4bc67 spec: Get BuildRequires min versions from configure.ac
We currently duplicate the minimum requirements for the various virt-viewer
dependencies in configure.ac, virt-viewer.spec.in and mingw-virt-viewer.spec.in
This commit uses the versions set in configure.ac in the 2 .spec.in files
so that it's easier to keep them in sync

Before/after diff of the .spec files are:

--- virt-viewer.spec.or 2013-12-18 14:14:14.304285905 +0100
+++ virt-viewer.spec    2013-12-18 14:19:20.217072678 +0100
@@ -47,14 +47,14 @@
 BuildRequires: libtool
 %endif

-BuildRequires: glib2-devel >= 2.22
+BuildRequires: glib2-devel >= 2.22.0
 %if %{with_gtk3}
-BuildRequires: gtk3-devel >= 3.0.0
+BuildRequires: gtk3-devel >= 3.0
 %else
-BuildRequires: gtk2-devel >= 2.12.0
+BuildRequires: gtk2-devel >= 2.18.0
 %endif
-BuildRequires: libvirt-devel >= 0.9.7
-BuildRequires: libxml2-devel
+BuildRequires: libvirt-devel >= 0.10.0
+BuildRequires: libxml2-devel >= 2.6.0
 %if %{with_gtk3}
 BuildRequires: gtk-vnc2-devel >= 0.4.0
 %else

--- mingw-virt-viewer.spec.or   2013-12-18 14:14:23.656401693 +0100
+++ mingw-virt-viewer.spec      2013-12-18 14:20:57.007270507 +0100
@@ -12,22 +12,22 @@

 BuildRequires:  mingw32-filesystem >= 23
 BuildRequires:  mingw64-filesystem >= 23
-BuildRequires:  mingw32-glib2 >= 2.22
-BuildRequires:  mingw64-glib2 >= 2.22
+BuildRequires:  mingw32-glib2 >= 2.22.0
+BuildRequires:  mingw64-glib2 >= 2.22.0
 BuildRequires:  mingw32-gstreamer-plugins-bad-free
 BuildRequires:  mingw64-gstreamer-plugins-bad-free
 BuildRequires:  mingw32-gstreamer-plugins-good
 BuildRequires:  mingw64-gstreamer-plugins-good
-BuildRequires:  mingw32-gtk2
-BuildRequires:  mingw64-gtk2
+BuildRequires:  mingw32-gtk2 >= 2.18.0
+BuildRequires:  mingw64-gtk2 >= 2.18.0
 BuildRequires:  mingw32-libusbx
 BuildRequires:  mingw64-libusbx
-BuildRequires:  mingw32-libvirt >= 0.9.7
-BuildRequires:  mingw64-libvirt >= 0.9.7
-BuildRequires:  mingw32-libxml2
-BuildRequires:  mingw64-libxml2
-BuildRequires:  mingw32-gtk-vnc >= 0.4.3
-BuildRequires:  mingw64-gtk-vnc >= 0.4.3
+BuildRequires:  mingw32-libvirt >= 0.10.0
+BuildRequires:  mingw64-libvirt >= 0.10.0
+BuildRequires:  mingw32-libxml2 >= 2.6.0
+BuildRequires:  mingw64-libxml2 >= 2.6.0
+BuildRequires:  mingw32-gtk-vnc >= 0.3.8
+BuildRequires:  mingw64-gtk-vnc >= 0.3.8
 BuildRequires:  mingw32-readline
 BuildRequires:  mingw64-readline
 BuildRequires:  mingw32-spice-glib
2013-12-18 15:42:24 +01:00
Christophe Fergeau
ae14b5b390 Update spice-gtk requirement everywhere
d1c2bc1 updated configure.ac spice-gtk requirement to 0.22, but did not
update the various places which duplicated this requirement, namely the
.spec.in files and the README file.
2013-12-18 15:42:24 +01:00
Christophe Fergeau
abf13d38b3 Update shared mime database on install/uninstall
remomte-viewer installs a file to $datadir/share/mime to register a
mime-type for its .vv files. However, after installing this file,
update-mime-database must be run in order to update the shared mime
database. This commit (inspired by what Nautilus/planner are doing) adds
what is needed for that.
If the mime type is not correctly registered, gvfs-info console.vv will not
return the correct mime type, and xdg-open console.vv will fail to start
remote-viewer, and will fall back to running gedit as the .vv file is a
text file.

https://bugzilla.redhat.com/show_bug.cgi?id=1044209
2013-12-18 14:20:39 +01:00
Christophe Fergeau
63671a00b3 Disable govirt support on f19
The govirt package in f19 is an older one, and does not have some of the
functions used since the switch to govirt 0.3.0. As 0.3.0 broke ABI, it's
not convenient to backport it to f19.
Update the spec file to reflect the fact that oVirt support in git is no
longer buildable on f19.
2013-12-13 16:01:05 +01:00
Christophe Fergeau
6a5fdf5a24 spec: Enable ovirt support on RHEL7 as well 2013-09-13 15:38:31 +02:00
Christophe Fergeau
865bb8769d spec: Group %define spice together
The rhel and fedora %define for enabling spice were separated, we
can group them for better readability.
2013-09-13 15:38:31 +02:00
Christophe Fergeau
6ca035dd4c spec: Build with gtk+3 on rhel7+ 2013-09-13 15:38:30 +02:00
Daniel P. Berrange
533342db14 Update min spice-gtk dep to 0.20
The spice_smartcard_manager_get_readers method was only added
in spice-gtk 0.20.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2013-07-31 11:54:33 +01:00
Christophe Fergeau
16df26cf5f spec: Add missing % in %if 0{?fedora}
This was missing in previous commit.
2013-06-04 18:26:13 +02:00