From b4fb93fa540a7c29092ae44dfe93b4ef907640cd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 22 Oct 2013 21:20:57 +0100 Subject: [PATCH] Don't use versioned jar file (RHBZ#1022133). --- libguestfs.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index 55bc0e9..333969c 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -12,7 +12,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.25.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ # Source and patches. @@ -712,6 +712,11 @@ if [ "$RPM_BUILD_ROOT%{python_sitearch}" != "$RPM_BUILD_ROOT%{python_sitelib}" ] $RPM_BUILD_ROOT%{python_sitelib}/ fi +# Don't use versioned jar file (RHBZ#1022133). +# See: https://bugzilla.redhat.com/show_bug.cgi?id=1022184#c4 +mv $RPM_BUILD_ROOT%{_datadir}/java/%{name}-%{version}.jar \ + $RPM_BUILD_ROOT%{_datadir}/java/%{name}.jar + # Move installed documentation back to the source directory so # we can install it using a %%doc rule. mv $RPM_BUILD_ROOT%{_docdir}/libguestfs installed-docs @@ -969,6 +974,9 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs %changelog +* Tue Oct 22 2013 Richard W.M. Jones - 1:1.25.0-2 +- Don't use versioned jar file (RHBZ#1022133). + * Sat Oct 19 2013 Richard W.M. Jones - 1:1.25.0-1 - New upstream version 1.25.0.