Address F20FTBFS (RHBZ#991895), F19FTBFS (RHBZ#914134):
- Package did not acknowledge RPM_OPT_FLAGS. - Fix link order. - BR: texlive-collection-latexrecommended - Make Makefiles verbose (Add libkni3-3.9.2-verbose.patch). - Reflect docdir changes (RHBZ#993829). - Fold-in *doc package's contents into %{_pkgdocdir}. - Make *doc-package noarch.
This commit is contained in:
parent
0e999cc510
commit
426783a819
|
@ -0,0 +1,260 @@
|
|||
diff -Naur KNI_3.9.2.orig/demo/burnintest/Makefile KNI_3.9.2/demo/burnintest/Makefile
|
||||
--- KNI_3.9.2.orig/demo/burnintest/Makefile 2007-06-20 08:05:24.000000000 +0200
|
||||
+++ KNI_3.9.2/demo/burnintest/Makefile 2013-08-26 06:56:25.276226404 +0200
|
||||
@@ -29,29 +29,15 @@
|
||||
|
||||
AVAILABLE_LIBRARIES = ../common/keyboard.o ${BASE_LIBRARY} ${INVKIN_LIBRARY} ${LM_LIBRARY}
|
||||
|
||||
-.SILENT:
|
||||
-
|
||||
.SUFFIXES: .cpp.o
|
||||
|
||||
.cpp.o:
|
||||
- echo -n "Compiling: $@"
|
||||
- if $(CXX) $(CXXFLAGS) $(INCLUDE) -c $< 2>.clog; \
|
||||
- then echo " [ok]"; \
|
||||
- cat .clog; \
|
||||
- else echo " [failed]"; \
|
||||
- cat .clog; \
|
||||
- fi
|
||||
+ $(CXX) $(CXXFLAGS) $(INCLUDE) -c $<
|
||||
|
||||
all: BurnInTest
|
||||
|
||||
BurnInTest: BurnInTest.o
|
||||
- echo -n "Building: $@"
|
||||
- if $(CXX) $(CXXFLAGS) -lpthread -o $@ $@.o ${AVAILABLE_LIBRARIES} 2>.clog; \
|
||||
- then echo " [ok]"; \
|
||||
- cat .clog; \
|
||||
- else echo " [failed]"; \
|
||||
- cat .clog; \
|
||||
- fi
|
||||
+ $(CXX) $(CXXFLAGS) -lpthread -o $@ $@.o ${AVAILABLE_LIBRARIES}
|
||||
|
||||
clean:
|
||||
echo "Cleaning up"
|
||||
diff -Naur KNI_3.9.2.orig/demo/Makefile KNI_3.9.2/demo/Makefile
|
||||
--- KNI_3.9.2.orig/demo/Makefile 2013-08-25 10:10:07.359358007 +0200
|
||||
+++ KNI_3.9.2/demo/Makefile 2013-08-26 07:38:44.218398437 +0200
|
||||
@@ -40,27 +40,13 @@
|
||||
|
||||
AVAILABLE_LIBRARIES = ./common/keyboard.o
|
||||
|
||||
-.SILENT:
|
||||
-
|
||||
all: $(TARGETS_D)
|
||||
|
||||
$(CTARGETS_D):
|
||||
- echo -n "Building: $@"
|
||||
- if $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -c -o common/$(@:.common=).o $(wildcard common/$(@:.common=).cpp) 2>.clog; \
|
||||
- then echo " [ok]"; \
|
||||
- cat .clog; \
|
||||
- else echo " [failed]"; \
|
||||
- cat .clog; \
|
||||
- fi
|
||||
+ $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -c -o common/$(@:.common=).o $(wildcard common/$(@:.common=).cpp)
|
||||
|
||||
$(TARGETS_D): $(CTARGETS_D)
|
||||
- echo -n "Building: $@"
|
||||
- if $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -L../lib/linux -lKNIBase3 -lKNI_InvKin3 -lKNI_LM3 -lpthread -o $(@:.demo=)/$(@:.demo=) $(wildcard $(@:.demo=)/*.cpp) ${AVAILABLE_LIBRARIES} 2>.clog; \
|
||||
- then echo " [ok]"; \
|
||||
- cat .clog; \
|
||||
- else echo " [failed]"; \
|
||||
- cat .clog; \
|
||||
- fi
|
||||
+ $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -L../lib/linux -o $(@:.demo=)/$(@:.demo=) $(wildcard $(@:.demo=)/*.cpp) ${AVAILABLE_LIBRARIES} -lKNIBase3 -lKNI_InvKin3 -lKNI_LM3 -lpthread
|
||||
|
||||
$(TARGETS_D_C):
|
||||
echo "Cleaning: $(@:_clean=)"
|
||||
diff -Naur KNI_3.9.2.orig/Makefile KNI_3.9.2/Makefile
|
||||
--- KNI_3.9.2.orig/Makefile 2007-09-27 07:47:18.000000000 +0200
|
||||
+++ KNI_3.9.2/Makefile 2013-08-26 05:50:13.692299525 +0200
|
||||
@@ -22,8 +22,6 @@
|
||||
TARGETS_B = $(foreach target,$(TARGETS),$(target).build)
|
||||
TARGETS_C = $(foreach target,$(TARGETS),$(target).clean)
|
||||
|
||||
-.SILENT:
|
||||
-
|
||||
.PHONY: all doc
|
||||
|
||||
all:
|
||||
diff -Naur KNI_3.9.2.orig/src/Base/Makefile KNI_3.9.2/src/Base/Makefile
|
||||
--- KNI_3.9.2.orig/src/Base/Makefile 2013-08-25 10:10:07.359358007 +0200
|
||||
+++ KNI_3.9.2/src/Base/Makefile 2013-08-26 06:53:10.626994097 +0200
|
||||
@@ -40,44 +40,19 @@
|
||||
SLCFLAGS=-fPIC
|
||||
SLLDFLAGS = -shared -L$(TARGET_DIR)
|
||||
|
||||
-.SILENT:
|
||||
-
|
||||
.SUFFIXES: .cpp.o
|
||||
|
||||
.cpp.o:
|
||||
- echo -n "Compiling: $@"
|
||||
- if $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -c $< 2>.clog; \
|
||||
- then echo " [ok]"; \
|
||||
- cat .clog; \
|
||||
- else echo " [failed]"; \
|
||||
- cat .clog; \
|
||||
- fi
|
||||
+ $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -c $<
|
||||
|
||||
all: $(TARGETS)
|
||||
|
||||
$(TARGET_DIR)/$(LIBNAME_A): $(SOURCES:.cpp=.o)
|
||||
- echo -n "Building: $@"
|
||||
- if $(AR) $(ARFLAGS) $@ $(SOURCES:.cpp=.o) 1>.alog 2>.alog; \
|
||||
- then echo " [ok]"; \
|
||||
- else echo " [failed]"; \
|
||||
- cat .alog; \
|
||||
- fi
|
||||
- echo -n "Adding common/additional dependencies..."
|
||||
- if $(AR) -r $@ $(ADDITIONAL_DEPS) 1>.alog 2>.alog; \
|
||||
- then echo " [ok]"; \
|
||||
- else echo " [failed]"; \
|
||||
- cat .alog; \
|
||||
- fi
|
||||
+ $(AR) $(ARFLAGS) $@ $(SOURCES:.cpp=.o)
|
||||
+ $(AR) -r $@ $(ADDITIONAL_DEPS)
|
||||
|
||||
$(TARGET_DIR)/$(LIBNAME_SO): $(SOURCES:.cpp=.o)
|
||||
- echo -n "Building: $@"
|
||||
- if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ -Wl,-soname,$(LIBNAME_SONAME) $(SOURCES:.cpp=.o) $(ADDITIONAL_DEPS) 2>.slog; \
|
||||
- then echo " [ok]"; \
|
||||
- ln -s $(LIBNAME_SO) $(TARGET_DIR)/$(LIBNAME_SO_LN); \
|
||||
- cat .slog; \
|
||||
- else echo " [failed]"; \
|
||||
- cat .slog; \
|
||||
- fi
|
||||
+ $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ -Wl,-soname,$(LIBNAME_SONAME) $(SOURCES:.cpp=.o) $(ADDITIONAL_DEPS)
|
||||
|
||||
alib: $(TARGET_DIR)/$(LIBNAME_A)
|
||||
|
||||
diff -Naur KNI_3.9.2.orig/src/common/Makefile KNI_3.9.2/src/common/Makefile
|
||||
--- KNI_3.9.2.orig/src/common/Makefile 2013-08-25 10:10:07.360358023 +0200
|
||||
+++ KNI_3.9.2/src/common/Makefile 2013-08-25 10:11:41.347932392 +0200
|
||||
@@ -37,23 +37,12 @@
|
||||
.SUFFIXES: .cpp.o
|
||||
|
||||
.cpp.o:
|
||||
- echo -n "Compiling: $@"
|
||||
- if $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -c $< 2>.clog; \
|
||||
- then echo " [ok]"; \
|
||||
- cat .clog; \
|
||||
- else echo " [failed]"; \
|
||||
- cat .clog; \
|
||||
- fi
|
||||
+ $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -c $<
|
||||
|
||||
all: $(TARGETS)
|
||||
|
||||
$(TARGET_DIR)/$(LIBNAME_A): $(SOURCES:.cpp=.o)
|
||||
- echo -n "Building: $@"
|
||||
- if $(AR) $(ARFLAGS) $@ $(SOURCES:.cpp=.o) 1>.alog 2>.alog; \
|
||||
- then echo " [ok]"; \
|
||||
- else echo " [failed]"; \
|
||||
- cat .alog; \
|
||||
- fi
|
||||
+ $(AR) $(ARFLAGS) $@ $(SOURCES:.cpp=.o)
|
||||
|
||||
alib: $(TARGET_DIR)/$(LIBNAME_A)
|
||||
|
||||
diff -Naur KNI_3.9.2.orig/src/InvKin/Makefile KNI_3.9.2/src/InvKin/Makefile
|
||||
--- KNI_3.9.2.orig/src/InvKin/Makefile 2013-08-25 10:10:07.360358023 +0200
|
||||
+++ KNI_3.9.2/src/InvKin/Makefile 2013-08-26 06:54:35.950411253 +0200
|
||||
@@ -41,44 +41,19 @@
|
||||
SLLDFLAGS=-shared -L$(TARGET_DIR) -lKNIBase3
|
||||
|
||||
|
||||
-.SILENT:
|
||||
-
|
||||
.SUFFIXES: .cpp.o
|
||||
|
||||
.cpp.o:
|
||||
- echo -n "Compiling: $@"
|
||||
- if $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -c $< 2>.clog; \
|
||||
- then echo " [ok]"; \
|
||||
- cat .clog; \
|
||||
- else echo " [failed]"; \
|
||||
- cat .clog; \
|
||||
- fi
|
||||
+ $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -c $<
|
||||
|
||||
all: $(TARGETS)
|
||||
|
||||
$(TARGET_DIR)/$(LIBNAME_A): $(SOURCES:.cpp=.o)
|
||||
- echo -n "Building: $@"
|
||||
- if $(AR) $(ARFLAGS) $@ $(SOURCES:.cpp=.o) 1>.alog 2>.alog; \
|
||||
- then echo " [ok]"; \
|
||||
- else echo " [failed]"; \
|
||||
- cat .alog; \
|
||||
- fi
|
||||
- echo -n "Adding common/additional dependencies..."
|
||||
- if $(AR) -r $@ $(ADDITIONAL_DEPS) 1>.alog 2>.alog; \
|
||||
- then echo " [ok]"; \
|
||||
- else echo " [failed]"; \
|
||||
- cat .alog; \
|
||||
- fi
|
||||
+ $(AR) $(ARFLAGS) $@ $(SOURCES:.cpp=.o)
|
||||
+ $(AR) -r $@ $(ADDITIONAL_DEPS)
|
||||
|
||||
$(TARGET_DIR)/$(LIBNAME_SO): $(SOURCES:.cpp=.o)
|
||||
- echo -n "Building: $@"
|
||||
- if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ -Wl,-soname,$(LIBNAME_SONAME) $(SOURCES:.cpp=.o) $(ADDITIONAL_DEPS) 2>.slog; \
|
||||
- then echo " [ok]"; \
|
||||
- ln -s $(LIBNAME_SO) $(TARGET_DIR)/$(LIBNAME_SO_LN); \
|
||||
- cat .slog; \
|
||||
- else echo " [failed]"; \
|
||||
- cat .slog; \
|
||||
- fi
|
||||
+ $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ -Wl,-soname,$(LIBNAME_SONAME) $(SOURCES:.cpp=.o) $(ADDITIONAL_DEPS)
|
||||
|
||||
alib: $(TARGET_DIR)/$(LIBNAME_A)
|
||||
|
||||
diff -Naur KNI_3.9.2.orig/src/LM/Makefile KNI_3.9.2/src/LM/Makefile
|
||||
--- KNI_3.9.2.orig/src/LM/Makefile 2013-08-25 10:10:07.360358023 +0200
|
||||
+++ KNI_3.9.2/src/LM/Makefile 2013-08-26 06:55:51.692668775 +0200
|
||||
@@ -45,39 +45,16 @@
|
||||
.SUFFIXES: .cpp.o
|
||||
|
||||
.cpp.o:
|
||||
- echo -n "Compiling: $@"
|
||||
- if $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -c $< 2>.clog; \
|
||||
- then echo " [ok]"; \
|
||||
- cat .clog; \
|
||||
- else echo " [failed]"; \
|
||||
- cat .clog; \
|
||||
- fi
|
||||
+ $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -c $<
|
||||
|
||||
all: $(TARGETS)
|
||||
|
||||
$(TARGET_DIR)/$(LIBNAME_A): $(SOURCES:.cpp=.o)
|
||||
- echo -n "Building: $@"
|
||||
- if $(AR) $(ARFLAGS) $@ $(SOURCES:.cpp=.o) 1>.alog 2>.alog; \
|
||||
- then echo " [ok]"; \
|
||||
- else echo " [failed]"; \
|
||||
- cat .alog; \
|
||||
- fi
|
||||
- echo -n "Adding common/additional dependencies..."
|
||||
- if $(AR) -r $@ $(ADDITIONAL_DEPS) 1>.alog 2>.alog; \
|
||||
- then echo " [ok]"; \
|
||||
- else echo " [failed]"; \
|
||||
- cat .alog; \
|
||||
- fi
|
||||
+ $(AR) $(ARFLAGS) $@ $(SOURCES:.cpp=.o)
|
||||
+ $(AR) -r $@ $(ADDITIONAL_DEPS)
|
||||
|
||||
$(TARGET_DIR)/$(LIBNAME_SO): $(SOURCES:.cpp=.o)
|
||||
- echo -n "Building: $@"
|
||||
- if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ -Wl,-soname,$(LIBNAME_SONAME) $(SOURCES:.cpp=.o) $(ADDITIONAL_DEPS) 2>.slog; \
|
||||
- then echo " [ok]"; \
|
||||
- ln -s $(LIBNAME_SO) $(TARGET_DIR)/$(LIBNAME_SO_LN); \
|
||||
- cat .slog; \
|
||||
- else echo " [failed]"; \
|
||||
- cat .slog; \
|
||||
- fi
|
||||
+ $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ -Wl,-soname,$(LIBNAME_SONAME) $(SOURCES:.cpp=.o) $(ADDITIONAL_DEPS)
|
||||
|
||||
alib: $(TARGET_DIR)/$(LIBNAME_A)
|
||||
|
37
libkni3.spec
37
libkni3.spec
|
@ -1,6 +1,6 @@
|
|||
Name: libkni3
|
||||
Version: 3.9.2
|
||||
Release: 20%{?dist}
|
||||
Release: 21%{?dist}
|
||||
Summary: C++ KNI library v3 for the Katana 300 robot arm
|
||||
|
||||
Group: System Environment/Libraries
|
||||
|
@ -12,11 +12,15 @@ Patch1: kni-3.9.2-sofixes.patch
|
|||
Patch2: kni-3.9.2-ctor.patch
|
||||
Patch3: kni-3.9.2-noexit.patch
|
||||
Patch4: kni-3.9.2-gcc47.patch
|
||||
# Make makefiles verbose
|
||||
Patch5: kni-3.9.2-verbose.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
|
||||
|
||||
BuildRequires: doxygen, graphviz
|
||||
%if 0%{?fedora} >= 9
|
||||
BuildRequires: texlive-utils
|
||||
%if 0%{?fedora} >= 18
|
||||
BuildRequires: texlive-collection-latexrecommended
|
||||
%else
|
||||
BuildRequires: tetex
|
||||
%endif
|
||||
|
@ -56,6 +60,7 @@ compile static binaries using %{name}.
|
|||
%package doc
|
||||
Summary: Documentation for %{name}
|
||||
Group: Documentation
|
||||
BuildArch: noarch
|
||||
|
||||
%description doc
|
||||
This package contains the documentation for developing with %{name}.
|
||||
|
@ -75,10 +80,10 @@ This package contains demo applications for %{name}.
|
|||
%patch2 -p1 -b .ctor
|
||||
%patch3 -p1 -b .noexit
|
||||
%patch4 -p1 -b .gcc47
|
||||
|
||||
%patch5 -p1
|
||||
|
||||
%build
|
||||
make CFLAGS="%{optflags}"
|
||||
make CXXFLAGS="%{optflags} -fPIC"
|
||||
make doc
|
||||
echo "prefix=%{prefix}
|
||||
exec_prefix=%{prefix}
|
||||
|
@ -113,9 +118,9 @@ install -p -m 0644 configfiles300/*.cfg %{buildroot}%{_sysconfdir}/kni3/hd300
|
|||
install -p -m 0644 configfiles400/*.cfg %{buildroot}%{_sysconfdir}/kni3/hd400
|
||||
mkdir -p %{buildroot}%{_includedir}/kni3
|
||||
cp -a include/* %{buildroot}%{_includedir}/kni3
|
||||
mkdir -p %{buildroot}%{_docdir}/%{name}-doc-%{version}
|
||||
cp -a doc/html %{buildroot}%{_docdir}/%{name}-doc-%{version}
|
||||
install -p -m 0644 doc/*.pdf %{buildroot}%{_docdir}/%{name}-doc-%{version}
|
||||
mkdir -p %{buildroot}%{_pkgdocdir}
|
||||
cp -a doc/html %{buildroot}%{_pkgdocdir}
|
||||
install -p -m 0644 doc/*.pdf %{buildroot}%{_pkgdocdir}
|
||||
find %{buildroot} -name '.svn' | xargs rm -rf
|
||||
mkdir -p %{buildroot}%{_libdir}/pkgconfig
|
||||
install -p -m 0644 libkni3.pc %{buildroot}%{_libdir}/pkgconfig
|
||||
|
@ -133,6 +138,8 @@ rm -rf %{buildroot}
|
|||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc LICENSE.txt readme.txt AUTHORS.txt
|
||||
%exclude %{_pkgdocdir}/html
|
||||
%exclude %{_pkgdocdir}/*.pdf
|
||||
%{_libdir}/*.so.*
|
||||
%dir %{_sysconfdir}/kni3
|
||||
%dir %{_sysconfdir}/kni3/hd300
|
||||
|
@ -151,7 +158,9 @@ rm -rf %{buildroot}
|
|||
|
||||
%files doc
|
||||
%defattr(-, root, root, 0755)
|
||||
%{_docdir}/%{name}-doc-%{version}
|
||||
%dir %{_pkgdocdir}
|
||||
%{_pkgdocdir}/html
|
||||
%{_pkgdocdir}/*.pdf
|
||||
|
||||
%files examples
|
||||
%defattr(-, root, root, 0755)
|
||||
|
@ -159,6 +168,16 @@ rm -rf %{buildroot}
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon Aug 26 2013 Ralf Corsépius <corsepiu@fedoraproject.org> - 3.9.2-21
|
||||
- Address F20FTBFS (RHBZ#991895), F19FTBFS (RHBZ#914134):
|
||||
- Package did not acknowledge RPM_OPT_FLAGS.
|
||||
- Fix link order.
|
||||
- BR: texlive-collection-latexrecommended
|
||||
- Make Makefiles verbose (Add libkni3-3.9.2-verbose.patch).
|
||||
- Reflect docdir changes (RHBZ#993829).
|
||||
- Fold-in *doc package's contents into %%{_pkgdocdir}.
|
||||
- Make *doc-package noarch.
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.9.2-20
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
|
|
Loading…
Reference in New Issue