39 Commits

Author SHA1 Message Date
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
Marc-André Lureau
5d04a426db win32: remove debug-helper.exe
This helper was useful to debug spice controller & activex plugin. Now
that the controller is gone, it is no longer needed.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Victor Toso <victortoso@redhat.com>
2017-11-16 17:04:28 +01:00
Fabiano Fidêncio
3ab81d7617 mingw,spec: Bump msitools version
Fedora 24 has GLib 2.48.0, which brings a new dependency: PCRE.
The new dependency is already added to the wxi file (in msitools) and a
new msitools build including the fix is already done [0].

Let's just bump the version in our spec file and make sure we will be
using the msitools which includes the fix.

[0]: https://bodhi.fedoraproject.org/updates/FEDORA-2016-a7a2db6109

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
2016-06-23 17:33:58 +02:00
Fabiano Fidêncio
ad40386fa2 msi: Depend on mingw-adwaita-icon-theme
Instead of maintain a file which includes every single icon that we use
from adwaita-icon-theme (adwaita-icons-needed.wxi.in), let's depend on
mingw-adwaita-icon-theme directly.
It reduces considerably the maintainability and the risk to have missing
icons. Although, the size of the final binary gets increased from ~35MB
to ~50MB.

Resolves: rhbz#1301064
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
Acked-by: Christophe Fergeau <cfergeau@redhat.com>
2016-05-03 08:04:23 +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
2c712a0525 mingw: Bump msitools version
Since commit 5d98df3 we depend on msitools 0.95-2.

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
Acked-by: Pavel Grunt <pgrunt@redhat.com>
2016-02-24 08:27:08 +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
Daniel P. Berrange
d71bb09046 s/mingw62/mingw64/ in RPM spec file 2015-12-03 13:34:55 +00:00
Daniel P. Berrange
0de42b746e Avoid macro in RPM comment 2015-12-03 13:34:55 +00: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
cd2d9acc41 mingw,spec: Fix mingw-gstreamer1-plugins-bad-free name
The package was created with a wrong name (mingw-gstreamer1-plugins-bad)
and then fixed (mingw-gstreamer1-plugins-bad-free) for f22 and newer.
2015-06-24 14:34:48 +02:00
Fabiano Fidêncio
3e47ae0383 mingw-spec: Update msitools dependency
The new msitools release includes the necessaries changes for fixing
mingw-virt-viewer build (on fedora22).

These fixes are:
- an updated libvirt.wxi, removing storageencryption.rng file
- a new included libeproxy.wxi, a new dep for gtk3 since its 3.15.3
  version.
2015-06-23 16:43:03 +02:00
Fabiano Fidêncio
d366f20180 spec: Add virt-viewer-preferences.xml
The file was introduced in commit
73b80ba99fb80140cadd07bbbf09a412bb9a0098
2015-03-12 18:09:28 +01:00
Daniel P. Berrange
a2a38b2721 Add deps on mingw glib-networking RPMs needed by libsoup 2015-01-09 11:13:30 +00:00
Daniel P. Berrange
d7e524fa75 Update mingw RPM deps to refer to gstreamer1 2015-01-09 10:51:45 +00:00
Daniel P. Berrange
83d0ea485e Fix typo s/SPICE_GTK3_REQUIRED/SPICE_GTK_REQUIRED/
There is no separate version constant for SPICE GTK2 vs GTK3
2015-01-08 18:05:53 +00:00
Fabiano Fidêncio
f05f30d7de spec: Update mingw in order to use gstreamer1 2015-01-05 23:28:26 +01:00
Fabiano Fidêncio
ca1dac5ba9 spec: Update mingw in order to use ovirt 2014-12-23 00:57:44 +01:00
Fabiano Fidêncio
25a236473a spec: Update mingw in order to use gtk3 2014-12-23 00:55:58 +01:00
Daniel P. Berrange
acc9d72ba7 Add new ui files to the RPMs 2014-10-27 16:53:48 +00:00
Daniel P. Berrange
28a6bd6cf4 Bump version 1.0 to simplify Windows MSI versioning
The Windows MSI product version is restricted to a 3 component
version number, whose fields are a max value of 255.255.65536

Since the main virt-viewer version takes up 3 components already,
we have the munge the micro version together with the first
component of the release version. eg we have

   $VERSION[0].$VERSION[1].($VERSION[2] << 8 + $RELEASE[0])

This causes problems for RHEL which needs to have 2-component
release versions to deal with z-stream builds.  eg a RHEL
version might be virt-viewer-0.5.6-2.el6_4.3 and we've
no easy way of adding the final '.3' to the Windows product
version.

If we reduce the primary virt-viewer version to just 2 components,
then we can leave the 3rd component for exclusive use by the RPM
release number. eg so we'd make product version up using

   $VERSION[0].$VERSION[1].($RELEASE[0] << 8 + $RELEASE[1])

In course of normal development, we'd increase the $VERSION[0]
for each release. ie next release is 1.0, then 2.0, then 3.0.
This means we retain the ability to put out "stable" branch
releases for any historical version by doing 1.1, 1.2 instead
of having to re-add a 3rd component.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2014-06-23 16:16:01 +01: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
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
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
Marc-André Lureau
356e635844 mingw spec: fix x64 msi location 2013-04-23 12:50:23 +02:00
Marc-André Lureau
29f7ee33ca msi: build correct 64-bit msi 2013-04-15 16:46:48 +02:00
Marc-André Lureau
dbb1cfc046 build-sys: generate MSI installer instead of NSIS 2013-04-15 16:46:48 +02:00
Daniel P. Berrange
cd03c8e7ab Update min spice-gtk requirement docs / RPM requires 2013-02-13 16:16:35 +00:00
Marc-André Lureau
a52b5ea88c build-sys: add --with-buildid to details build version
Add a configure argument to append build version details, similar to
what Daniel Berrange proposed in the "use finer package version in
mingw-virt-viewer" thread on the ML.
2013-02-12 18:56:33 +01:00
Christophe Fergeau
9749a1d2c9 Add missing intltool BuildRequires
The configure script fails if intltool is not installed.
2013-01-24 12:58:06 +01:00
Christophe Fergeau
adeb7c7511 mingw: Add packages for virt-viewer NSIS installer
This makes it much easier to build an updated Windows installer binary
as this can now be done using mock/koji/... by using this .spec and
a virt-viewer tarball.
2013-01-24 12:58:06 +01:00
Christophe Fergeau
55585efd47 mingw: Build a gtk2 version of virt-viewer
The nsis file we ship is generating an installer for a GTK+2 build
of virt-viewer, so it's inconsistent for the mingw-virt-viewer
spec file to generate a GTK+3 build. Switch to building a GTK+2
version of virt-viewer in mingw-virt-viewer.spec
2013-01-24 12:58:06 +01:00
Christophe Fergeau
e474656e9b mingw: Package debug-helper.exe 2013-01-24 12:58:06 +01:00
Christophe Fergeau
9c7802445d mingw: Package debug files
When building on f18, the build fails because of unpackaged
debug files. Use the appropriate mingw macro to generate
the mingw debug packages.

The build failure is:

RPM build errors:
error: Installed (but unpackaged) file(s) found:
   /usr/i686-w64-mingw32/sys-root/mingw/bin/debug-helper.exe.debug
   /usr/i686-w64-mingw32/sys-root/mingw/bin/remote-viewer.exe.debug
   /usr/i686-w64-mingw32/sys-root/mingw/bin/virt-viewer.exe.debug
   /usr/i686-w64-mingw32/sys-root/mingw/bin/windows-cmdline-wrapper.exe.debug
   /usr/x86_64-w64-mingw32/sys-root/mingw/bin/debug-helper.exe.debug
   /usr/x86_64-w64-mingw32/sys-root/mingw/bin/remote-viewer.exe.debug
   /usr/x86_64-w64-mingw32/sys-root/mingw/bin/virt-viewer.exe.debug
   /usr/x86_64-w64-mingw32/sys-root/mingw/bin/windows-cmdline-wrapper.exe.debug
    Installed (but unpackaged) file(s) found:
   /usr/i686-w64-mingw32/sys-root/mingw/bin/debug-helper.exe.debug
   /usr/i686-w64-mingw32/sys-root/mingw/bin/remote-viewer.exe.debug
   /usr/i686-w64-mingw32/sys-root/mingw/bin/virt-viewer.exe.debug
   /usr/i686-w64-mingw32/sys-root/mingw/bin/windows-cmdline-wrapper.exe.debug
   /usr/x86_64-w64-mingw32/sys-root/mingw/bin/debug-helper.exe.debug
   /usr/x86_64-w64-mingw32/sys-root/mingw/bin/remote-viewer.exe.debug
   /usr/x86_64-w64-mingw32/sys-root/mingw/bin/virt-viewer.exe.debug
   /usr/x86_64-w64-mingw32/sys-root/mingw/bin/windows-cmdline-wrapper.exe.debug
2013-01-24 12:58:06 +01:00
Christophe Fergeau
7f9ceefa06 mingw: Fix typo in mingw macro name (hedder -> header) 2013-01-24 12:58:06 +01:00
Daniel P. Berrange
c8e0550a82 Convert to use Mingw64 toolchain for Windows biulds 2012-09-14 17:34:53 +01:00