Compare commits
38 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
cf942d0af5 | ||
|
0652b982b3 | ||
|
9d2d9bdc25 | ||
|
0ff654c2b6 | ||
|
691bab2281 | ||
|
2a523badba | ||
|
234f7295a3 | ||
|
ab75689487 | ||
|
f6f5ef54f1 | ||
|
9119a965d6 | ||
|
c95b554232 | ||
|
a7c64f00f1 | ||
|
e83c38f94f | ||
|
da8a7a25fa | ||
|
0dd99c2c95 | ||
|
c703031d4a | ||
|
be46b7122b | ||
|
6b33ba1705 | ||
|
c788d9d479 | ||
|
1cf245f871 | ||
|
7bc1821f2b | ||
|
d6de3e6acf | ||
|
b63bd91625 | ||
|
d670e07c43 | ||
|
5385ea4d7e | ||
|
155365f2ab | ||
|
426783a819 | ||
|
0e999cc510 | ||
|
b2360815e6 | ||
|
9b339d05d6 | ||
|
65bd582668 | ||
|
f05751f7a7 | ||
|
22b21d132b | ||
|
8495fd9948 | ||
|
228202b955 | ||
|
0320bf3ac8 | ||
|
f8b18aab2d | ||
|
0f92bb6c66 |
11
kni-3.9.2-format-security.patch
Normal file
11
kni-3.9.2-format-security.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- a/demo/perfo/perfo.cpp
|
||||||
|
+++ b/demo/perfo/perfo.cpp
|
||||||
|
@@ -15,7 +15,7 @@ int maxCnt; //global variable: count of communication tries
|
||||||
|
|
||||||
|
void statKatRecv(const char strTitle[], long i, long j, clock_t t, long l) {
|
||||||
|
printf("-------------------------------------------\n");
|
||||||
|
- printf(strTitle); printf("\tAverage: %.3f [ms]\n", (double)t/(double)l);
|
||||||
|
+ printf("%s", strTitle); printf("\tAverage: %.3f [ms]\n", (double)t/(double)l);
|
||||||
|
printf("-------------------------------------------\n");
|
||||||
|
printf("RECV_NO_ERR : %.3f %ld\n", (double)i/(double)l, i);
|
||||||
|
printf("RECV_READING_ERR : %.3f %ld\n", (double)j/(double)l, j);
|
11
kni-3.9.2-gcc47.patch
Normal file
11
kni-3.9.2-gcc47.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
diff -up KNI_3.9.2/src/Base/cdlCOM.cpp.gcc47 KNI_3.9.2/src/Base/cdlCOM.cpp
|
||||||
|
--- KNI_3.9.2/src/Base/cdlCOM.cpp.gcc47 2012-03-08 11:25:45.466392402 -0500
|
||||||
|
+++ KNI_3.9.2/src/Base/cdlCOM.cpp 2012-03-08 11:25:54.399317676 -0500
|
||||||
|
@@ -26,6 +26,7 @@
|
||||||
|
#include <cstdio>
|
||||||
|
|
||||||
|
#include <cstdlib>
|
||||||
|
+#include <unistd.h>
|
||||||
|
#ifdef WIN32
|
||||||
|
|
||||||
|
CCdlCOM::CCdlCOM(TCdlCOMDesc ccd) : _deviceName(""), _ccd(), _prtHdl(INVALID_HANDLE_VALUE), _oto() {
|
260
kni-3.9.2-verbose.patch
Normal file
260
kni-3.9.2-verbose.patch
Normal file
@ -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)
|
||||||
|
|
147
libkni3.spec
147
libkni3.spec
@ -1,9 +1,8 @@
|
|||||||
Name: libkni3
|
Name: libkni3
|
||||||
Version: 3.9.2
|
Version: 3.9.2
|
||||||
Release: 12%{?dist}
|
Release: 42%{?dist}
|
||||||
Summary: C++ KNI library v3 for the Katana 300 robot arm
|
Summary: C++ KNI library v3 for the Katana 300 robot arm
|
||||||
|
|
||||||
Group: System Environment/Libraries
|
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://www.neuronics.ch/cms_de/web/index.php?id=386
|
URL: http://www.neuronics.ch/cms_de/web/index.php?id=386
|
||||||
Source0: http://www.neuronics.ch/cms_de/mediabase/KNI_3.9.2.tar.gz
|
Source0: http://www.neuronics.ch/cms_de/mediabase/KNI_3.9.2.tar.gz
|
||||||
@ -11,11 +10,17 @@ Patch0: kni-3.9.2-gcc43.patch
|
|||||||
Patch1: kni-3.9.2-sofixes.patch
|
Patch1: kni-3.9.2-sofixes.patch
|
||||||
Patch2: kni-3.9.2-ctor.patch
|
Patch2: kni-3.9.2-ctor.patch
|
||||||
Patch3: kni-3.9.2-noexit.patch
|
Patch3: kni-3.9.2-noexit.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
Patch4: kni-3.9.2-gcc47.patch
|
||||||
|
# Make makefiles verbose
|
||||||
|
Patch5: kni-3.9.2-verbose.patch
|
||||||
|
Patch6: kni-3.9.2-format-security.patch
|
||||||
|
|
||||||
|
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
|
||||||
|
|
||||||
|
BuildRequires: gcc, gcc-c++
|
||||||
BuildRequires: doxygen, graphviz
|
BuildRequires: doxygen, graphviz
|
||||||
%if 0%{?fedora} >= 9
|
%if 0%{?fedora} >= 18
|
||||||
BuildRequires: texlive-utils
|
BuildRequires: texlive-collection-latexrecommended
|
||||||
%else
|
%else
|
||||||
BuildRequires: tetex
|
BuildRequires: tetex
|
||||||
%endif
|
%endif
|
||||||
@ -33,7 +38,6 @@ newer robots use libkni (version 4 and above).
|
|||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Development files for %{name}
|
Summary: Development files for %{name}
|
||||||
Group: Development/Libraries
|
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
Requires: pkgconfig
|
Requires: pkgconfig
|
||||||
|
|
||||||
@ -44,7 +48,6 @@ developing applications that use %{name}.
|
|||||||
|
|
||||||
%package static
|
%package static
|
||||||
Summary: Static libraries for %{name}
|
Summary: Static libraries for %{name}
|
||||||
Group: Development/Libraries
|
|
||||||
Requires: %{name}-devel = %{version}-%{release}
|
Requires: %{name}-devel = %{version}-%{release}
|
||||||
|
|
||||||
%description static
|
%description static
|
||||||
@ -54,14 +57,13 @@ compile static binaries using %{name}.
|
|||||||
|
|
||||||
%package doc
|
%package doc
|
||||||
Summary: Documentation for %{name}
|
Summary: Documentation for %{name}
|
||||||
Group: Documentation
|
BuildArch: noarch
|
||||||
|
|
||||||
%description doc
|
%description doc
|
||||||
This package contains the documentation for developing with %{name}.
|
This package contains the documentation for developing with %{name}.
|
||||||
|
|
||||||
%package examples
|
%package examples
|
||||||
Summary: Example applications for %{name}
|
Summary: Example applications for %{name}
|
||||||
Group: Applications/System
|
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
|
||||||
%description examples
|
%description examples
|
||||||
@ -73,10 +75,12 @@ This package contains demo applications for %{name}.
|
|||||||
%patch1 -p1 -b .sofixes
|
%patch1 -p1 -b .sofixes
|
||||||
%patch2 -p1 -b .ctor
|
%patch2 -p1 -b .ctor
|
||||||
%patch3 -p1 -b .noexit
|
%patch3 -p1 -b .noexit
|
||||||
|
%patch4 -p1 -b .gcc47
|
||||||
|
%patch5 -p1
|
||||||
|
%patch6 -p1 -b .format
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make CFLAGS="%{optflags}"
|
make CXXFLAGS="%{optflags} -fPIC"
|
||||||
make doc
|
make doc
|
||||||
echo "prefix=%{prefix}
|
echo "prefix=%{prefix}
|
||||||
exec_prefix=%{prefix}
|
exec_prefix=%{prefix}
|
||||||
@ -111,26 +115,22 @@ install -p -m 0644 configfiles300/*.cfg %{buildroot}%{_sysconfdir}/kni3/hd300
|
|||||||
install -p -m 0644 configfiles400/*.cfg %{buildroot}%{_sysconfdir}/kni3/hd400
|
install -p -m 0644 configfiles400/*.cfg %{buildroot}%{_sysconfdir}/kni3/hd400
|
||||||
mkdir -p %{buildroot}%{_includedir}/kni3
|
mkdir -p %{buildroot}%{_includedir}/kni3
|
||||||
cp -a include/* %{buildroot}%{_includedir}/kni3
|
cp -a include/* %{buildroot}%{_includedir}/kni3
|
||||||
mkdir -p %{buildroot}%{_docdir}/%{name}-doc-%{version}
|
mkdir -p %{buildroot}%{_pkgdocdir}
|
||||||
cp -a doc/html %{buildroot}%{_docdir}/%{name}-doc-%{version}
|
cp -a doc/html %{buildroot}%{_pkgdocdir}
|
||||||
install -p -m 0644 doc/*.pdf %{buildroot}%{_docdir}/%{name}-doc-%{version}
|
install -p -m 0644 doc/*.pdf %{buildroot}%{_pkgdocdir}
|
||||||
find %{buildroot} -name '.svn' | xargs rm -rf
|
find %{buildroot} -name '.svn' | xargs rm -rf
|
||||||
mkdir -p %{buildroot}%{_libdir}/pkgconfig
|
mkdir -p %{buildroot}%{_libdir}/pkgconfig
|
||||||
install -p -m 0644 libkni3.pc %{buildroot}%{_libdir}/pkgconfig
|
install -p -m 0644 libkni3.pc %{buildroot}%{_libdir}/pkgconfig
|
||||||
|
|
||||||
|
|
||||||
%clean
|
|
||||||
rm -rf %{buildroot}
|
|
||||||
|
|
||||||
|
%ldconfig_scriptlets
|
||||||
%post -p /sbin/ldconfig
|
|
||||||
|
|
||||||
%postun -p /sbin/ldconfig
|
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%doc LICENSE.txt readme.txt AUTHORS.txt
|
%doc LICENSE.txt readme.txt AUTHORS.txt
|
||||||
|
%exclude %{_pkgdocdir}/html
|
||||||
|
%exclude %{_pkgdocdir}/*.pdf
|
||||||
%{_libdir}/*.so.*
|
%{_libdir}/*.so.*
|
||||||
%dir %{_sysconfdir}/kni3
|
%dir %{_sysconfdir}/kni3
|
||||||
%dir %{_sysconfdir}/kni3/hd300
|
%dir %{_sysconfdir}/kni3/hd300
|
||||||
@ -138,25 +138,120 @@ rm -rf %{buildroot}
|
|||||||
%config(noreplace)%{_sysconfdir}/kni3/*/*.cfg
|
%config(noreplace)%{_sysconfdir}/kni3/*/*.cfg
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%{_includedir}/*
|
%{_includedir}/*
|
||||||
%{_libdir}/*.so
|
%{_libdir}/*.so
|
||||||
%{_libdir}/pkgconfig/*
|
%{_libdir}/pkgconfig/*
|
||||||
|
|
||||||
%files static
|
%files static
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%{_libdir}/*.a
|
%{_libdir}/*.a
|
||||||
|
|
||||||
%files doc
|
%files doc
|
||||||
%defattr(-, root, root, 0755)
|
%dir %{_pkgdocdir}
|
||||||
%{_docdir}/%{name}-doc-%{version}
|
%{_pkgdocdir}/html
|
||||||
|
%{_pkgdocdir}/*.pdf
|
||||||
|
|
||||||
%files examples
|
%files examples
|
||||||
%defattr(-, root, root, 0755)
|
|
||||||
%{_bindir}/kni_*
|
%{_bindir}/kni_*
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.2-42
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.2-41
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.2-40
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Mar 07 2018 Tim Niemueller <tim@niemueller.de> - 3.9.2-39
|
||||||
|
- BR gcc and gcc-c++
|
||||||
|
|
||||||
|
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.2-38
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.2-37
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.2-36
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.2-35
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jan 27 2017 Jonathan Wakely <jwakely@redhat.com> - 3.9.2-34
|
||||||
|
- Rebuilt for Boost 1.63
|
||||||
|
|
||||||
|
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.2-33
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jan 15 2016 Jonathan Wakely <jwakely@redhat.com> - 3.9.2-32
|
||||||
|
- Rebuilt for Boost 1.60
|
||||||
|
|
||||||
|
* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 3.9.2-31
|
||||||
|
- Rebuilt for Boost 1.59
|
||||||
|
|
||||||
|
* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.9.2-30
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
|
||||||
|
|
||||||
|
* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 3.9.2-29
|
||||||
|
- rebuild for Boost 1.58
|
||||||
|
|
||||||
|
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.9.2-28
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 3.9.2-27
|
||||||
|
- Rebuilt for GCC 5 C++11 ABI change
|
||||||
|
|
||||||
|
* Tue Jan 27 2015 Petr Machata <pmachata@redhat.com> - 3.9.2-26
|
||||||
|
- Rebuild for boost 1.57.0
|
||||||
|
|
||||||
|
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.9.2-25
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jul 31 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 3.9.2-24
|
||||||
|
- Fix FTBFS with -Werror=format-security (#1037167, #1106032)
|
||||||
|
|
||||||
|
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.9.2-23
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri May 23 2014 Petr Machata <pmachata@redhat.com> - 3.9.2-22
|
||||||
|
- Rebuild for boost 1.55.0
|
||||||
|
|
||||||
|
* 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
|
||||||
|
|
||||||
|
* Tue Jul 30 2013 Petr Machata <pmachata@redhat.com> - 3.9.2-19
|
||||||
|
- Rebuild for boost 1.54.0
|
||||||
|
|
||||||
|
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.9.2-18
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.9.2-17
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Mar 8 2012 Tom Callaway <spot@fedoraproject.org> - 3.9.2-16
|
||||||
|
- fix build with gcc 4.7
|
||||||
|
|
||||||
|
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.9.2-15
|
||||||
|
- Rebuilt for c++ ABI breakage
|
||||||
|
|
||||||
|
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.9.2-14
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.9.2-13
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||||
|
|
||||||
* Mon Sep 14 2009 Tim Niemueller <tim@niemueller.de> - 3.9.2-12
|
* Mon Sep 14 2009 Tim Niemueller <tim@niemueller.de> - 3.9.2-12
|
||||||
- doc package contains doc dir, not docs
|
- doc package contains doc dir, not docs
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user