[roboptim-trajectory/f18] fix ftbfs

Tom Callaway spot at fedoraproject.org
Fri Aug 17 18:32:12 UTC 2012


commit 0aeef9e7a9b41e697998159d3a53d194ad62ed0d
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Fri Aug 17 14:32:50 2012 -0400

    fix ftbfs

 roboptim-trajectory-0.5-nocheckversion.patch |   20 ++++++++++++++++++++
 roboptim-trajectory.spec                     |    5 +++--
 2 files changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/roboptim-trajectory-0.5-nocheckversion.patch b/roboptim-trajectory-0.5-nocheckversion.patch
new file mode 100644
index 0000000..82b03d1
--- /dev/null
+++ b/roboptim-trajectory-0.5-nocheckversion.patch
@@ -0,0 +1,20 @@
+diff -up roboptim-trajectory-0.5/Makefile.in.nocheckversion roboptim-trajectory-0.5/Makefile.in
+--- roboptim-trajectory-0.5/Makefile.in.nocheckversion	2012-08-17 14:14:01.100747085 -0400
++++ roboptim-trajectory-0.5/Makefile.in	2012-08-17 14:14:26.494746102 -0400
+@@ -1093,11 +1093,11 @@ $(top_srcdir)/.version:
+ # being done but do not regenerate the version string automatically.
+ .PHONY: check-version
+ check-version:
+-	@if ! test x$(CURRENT_VERSION) = x$(VERSION); then		\
+-	 echo "WARNING: Version string is out of date.";		\
+-	 echo "         please run \`\`make _version'' and reinstall.";	\
+-	 exit 42;							\
+-	fi
++	# @if ! test x$(CURRENT_VERSION) = x$(VERSION); then		\
++	#  echo "WARNING: Version string is out of date.";		\
++	#  echo "         please run \`\`make _version'' and reinstall.";	\
++	# exit 42;							\
++	# fi
+ 
+ install-exec-hook: check-version
+ install-data-hook: check-version
diff --git a/roboptim-trajectory.spec b/roboptim-trajectory.spec
index a8e1386..a189478 100644
--- a/roboptim-trajectory.spec
+++ b/roboptim-trajectory.spec
@@ -7,7 +7,7 @@ Group: Development/Libraries
 License: LGPLv3+
 URL: http://roboptim.sourceforge.net/
 Source0: http://downloads.sourceforge.net/roboptim/%{name}-%{version}.tar.gz
-
+Patch0: roboptim-trajectory-0.5-nocheckversion.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: roboptim-core-devel, boost-devel
@@ -43,6 +43,7 @@ Documentation for the RobOptim trajectory library
 
 %prep
 %setup -q
+%patch0 -p1 -b .nocheckversion
 
 %build
 %configure --docdir=%{_docdir}/%{name}-%{version} --disable-static
@@ -65,7 +66,7 @@ install -cpm 644 AUTHORS COPYING README NEWS \
 rm $RPM_BUILD_ROOT/%{_libdir}/*.la
 
 # Get rid of Doxygen's installdox.
-rm $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}/doxygen-html/installdox
+# rm $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}/doxygen-html/installdox
 
 
 %clean


More information about the scm-commits mailing list