[Spice-commits] 2 commits - configure.ac mingw-spice-vdagent.spec mingw-spice-vdagent.spec.in

[Christophe Fergau]

 configure.ac                |    1 
 mingw-spice-vdagent.spec    |   93 --------------------------------------------
 mingw-spice-vdagent.spec.in |   92 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 93 insertions(+), 93 deletions(-)

New commits:
commit 0399b981580d6c39307fde506dabf7655931d2c3
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Thu Jan 24 12:03:38 2013 +0100

    spec: Automatically substitute version
    
    This commit generates a .spec file with the right version number
    when configure is run.

diff --git a/configure.ac b/configure.ac
index 3fb17ee..12329b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,6 +74,7 @@ dnl ---------------------------------------------------------------------------
 AC_CONFIG_SUBDIRS([spice-protocol])
 AC_CONFIG_FILES([
 Makefile
+mingw-spice-vdagent.spec
 ])
 AC_OUTPUT
 
diff --git a/mingw-spice-vdagent.spec b/mingw-spice-vdagent.spec
deleted file mode 100644
index 1351419..0000000
--- a/mingw-spice-vdagent.spec
+++ /dev/null
@@ -1,94 +0,0 @@
-%{?mingw_package_header}
-
-#define _version_suffix -e198
-
-Name:           mingw-spice-vdagent
-Version:        0.7.0
-Release:        1%{?dist}%{?extra_release}
-Summary:        MinGW Windows SPICE guest agent
-
-License:        GPLv2+
-URL:            http://spice-space.org/
-Source0:        vdagent-win-%{version}%{?_version_suffix}.tar.xz
-
-BuildRequires:  mingw32-filesystem >= 23
-BuildRequires:  mingw64-filesystem >= 23
-BuildRequires:  mingw32-cximage-static
-BuildRequires:  mingw64-cximage-static
-BuildRequires:  mingw32-jasper-static
-BuildRequires:  mingw64-jasper-static
-BuildRequires:  mingw32-libjpeg-turbo-static
-BuildRequires:  mingw64-libjpeg-turbo-static
-BuildRequires:  mingw32-libpng-static
-BuildRequires:  mingw64-libpng-static
-BuildRequires:  mingw32-libtiff-static
-BuildRequires:  mingw64-libtiff-static
-BuildRequires:  mingw32-zlib-static
-BuildRequires:  mingw64-zlib-static
-BuildRequires:  pkgconfig
-
-BuildArch:      noarch
-
-%package -n mingw32-spice-vdagent
-Summary:        MinGW Windows SPICE guest agent
-
-%package -n mingw64-spice-vdagent
-Summary:        MinGW Windows SPICE guest agent
-
-%description
-Spice agent for Windows guests offering the following features:
-
-Features:
-* Client mouse mode (no need to grab mouse by client, no mouse lag)
-  this is handled by the daemon by feeding mouse events into the kernel
-  via uinput.
-* Automatic adjustment of the Windows desktop resolution to the client resolution
-* Support of copy and paste (text and images) between the active Windows
-  session and the client
-
-%description -n mingw32-spice-vdagent
-Spice agent for Windows guests offering the following features:
-
-Features:
-* Client mouse mode (no need to grab mouse by client, no mouse lag)
-  this is handled by the daemon by feeding mouse events into the kernel
-  via uinput.
-* Automatic adjustment of the Windows desktop resolution to the client resolution
-* Support of copy and paste (text and images) between the active Windows
-  session and the client
-
-%description -n mingw64-spice-vdagent
-Spice agent for Windows guests offering the following features:
-
-Features:
-* Client mouse mode (no need to grab mouse by client, no mouse lag)
-  this is handled by the daemon by feeding mouse events into the kernel
-  via uinput.
-* Automatic adjustment of the Windows desktop resolution to the client resolution
-* Support of copy and paste (text and images) between the active Windows
-  session and the client
-
-%prep
-%setup -q -n vdagent-win-%{version}%{?_version_suffix}
-
-%{mingw_debug_package}
-
-%build
-%mingw_configure
-%mingw_make %{?_smp_mflags} V=1
-
-
-%install
-%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
-
-%files -n mingw32-spice-vdagent
-%defattr(-,root,root)
-%{mingw32_bindir}/vdagent.exe
-%{mingw32_bindir}/vdservice.exe
-
-%files -n mingw64-spice-vdagent
-%defattr(-,root,root)
-%{mingw64_bindir}/vdagent.exe
-%{mingw64_bindir}/vdservice.exe
-
-%changelog
diff --git a/mingw-spice-vdagent.spec.in b/mingw-spice-vdagent.spec.in
new file mode 100644
index 0000000..d1bcf70
--- /dev/null
+++ b/mingw-spice-vdagent.spec.in
@@ -0,0 +1,92 @@
+%{?mingw_package_header}
+
+#define _version_suffix -e198
+
+Name:           mingw-spice-vdagent
+Version:        @VERSION@
+Release:        1%{?dist}%{?extra_release}
+Summary:        MinGW Windows SPICE guest agent
+
+License:        GPLv2+
+URL:            http://spice-space.org/
+Source0:        vdagent-win-%{version}%{?_version_suffix}.tar.xz
+
+BuildRequires:  mingw32-filesystem >= 23
+BuildRequires:  mingw64-filesystem >= 23
+BuildRequires:  mingw32-cximage-static
+BuildRequires:  mingw64-cximage-static
+BuildRequires:  mingw32-jasper-static
+BuildRequires:  mingw64-jasper-static
+BuildRequires:  mingw32-libjpeg-turbo-static
+BuildRequires:  mingw64-libjpeg-turbo-static
+BuildRequires:  mingw32-libpng-static
+BuildRequires:  mingw64-libpng-static
+BuildRequires:  mingw32-libtiff-static
+BuildRequires:  mingw64-libtiff-static
+BuildRequires:  mingw32-zlib-static
+BuildRequires:  mingw64-zlib-static
+BuildRequires:  pkgconfig
+
+BuildArch:      noarch
+
+%package -n mingw32-spice-vdagent
+Summary:        MinGW Windows SPICE guest agent
+
+%package -n mingw64-spice-vdagent
+Summary:        MinGW Windows SPICE guest agent
+
+%description
+Spice agent for Windows guests offering the following features:
+
+Features:
+* Client mouse mode (no need to grab mouse by client, no mouse lag)
+  this is handled by the daemon by feeding mouse events into the kernel
+  via uinput.
+* Automatic adjustment of the Windows desktop resolution to the client resolution
+* Support of copy and paste (text and images) between the active Windows
+  session and the client
+
+%description -n mingw32-spice-vdagent
+Spice agent for Windows guests offering the following features:
+
+Features:
+* Client mouse mode (no need to grab mouse by client, no mouse lag)
+  this is handled by the daemon by feeding mouse events into the kernel
+  via uinput.
+* Automatic adjustment of the Windows desktop resolution to the client resolution
+* Support of copy and paste (text and images) between the active Windows
+  session and the client
+
+%description -n mingw64-spice-vdagent
+Spice agent for Windows guests offering the following features:
+
+Features:
+* Client mouse mode (no need to grab mouse by client, no mouse lag)
+  this is handled by the daemon by feeding mouse events into the kernel
+  via uinput.
+* Automatic adjustment of the Windows desktop resolution to the client resolution
+* Support of copy and paste (text and images) between the active Windows
+  session and the client
+
+%prep
+%setup -q -n vdagent-win-%{version}%{?_version_suffix}
+
+%{mingw_debug_package}
+
+%build
+%mingw_configure
+%mingw_make %{?_smp_mflags} V=1
+
+
+%install
+%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
+
+%files -n mingw32-spice-vdagent
+%defattr(-,root,root)
+%{mingw32_bindir}/vdagent.exe
+%{mingw32_bindir}/vdservice.exe
+
+%files -n mingw64-spice-vdagent
+%defattr(-,root,root)
+%{mingw64_bindir}/vdagent.exe
+%{mingw64_bindir}/vdservice.exe
commit 9a08d00fd28885c522ba1423b1fc19131b62c570
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Thu Jan 24 12:02:17 2013 +0100

    spec: Add missing call to %mingw_debug_packages
    
    This automatically generates the needed debug packages for .debug
    files. Without this, the rpm build fails.

diff --git a/mingw-spice-vdagent.spec b/mingw-spice-vdagent.spec
index 7674ba0..1351419 100644
--- a/mingw-spice-vdagent.spec
+++ b/mingw-spice-vdagent.spec
@@ -71,6 +71,7 @@ Features:
 %prep
 %setup -q -n vdagent-win-%{version}%{?_version_suffix}
 
+%{mingw_debug_package}
 
 %build
 %mingw_configure