From 4ef49ce4cfa5dc90e4a17d1f3c2137f9c418fbb5 Mon Sep 17 00:00:00 2001 From: Dmitrij S. Kryzhevich Date: Jul 22 2018 03:13:41 +0000 Subject: Fix tag isue --- diff --git a/CQRlib-1.0.6-lib64.patch b/CQRlib-1.0.6-lib64.patch deleted file mode 100644 index 243a7c4..0000000 --- a/CQRlib-1.0.6-lib64.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- CQRlib-1.0.6/Makefile.lib64 2010-08-25 20:38:56.991145821 +0900 -+++ CQRlib-1.0.6/Makefile 2010-08-25 20:48:42.347039793 +0900 -@@ -69,7 +69,7 @@ - # Directories - # - ROOT = . --LIB = $(ROOT)/lib -+LIB = $(ROOT)/lib64 - BIN = $(ROOT)/bin - SRC = $(ROOT) - INC = $(ROOT) -@@ -88,15 +88,15 @@ - endif - - COMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c --LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -rpath $(INSTALLDIR)/lib -+LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -rpath $(INSTALLDIR)/lib64 - BUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES) --BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rdynamic -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib --BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib -+BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rdynamic -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib64 -+BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib64 - CPPCOMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(INCLUDES) $(WARNINGS) -c --CPPLIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CXX) -version-info $(VERSION) -rpath $(INSTALLDIR)/lib -+CPPLIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CXX) -version-info $(VERSION) -rpath $(INSTALLDIR)/lib64 - CPPBUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CXX) $(CPPFLAGS) $(INCLUDES) --CPPBUILD_COMMAND_DYNAMIC= $(LIBTOOL) --mode=link $(CXX) $(CPPFLAGS) -rdynamic -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib --CPPBUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CXX) $(CPPFLAGS) -static -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib -+CPPBUILD_COMMAND_DYNAMIC= $(LIBTOOL) --mode=link $(CXX) $(CPPFLAGS) -rdynamic -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib64 -+CPPBUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CXX) $(CPPFLAGS) -static -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib64 - INSTALL_COMMAND = $(LIBTOOL) --mode=install cp - INSTALL_FINISH_COMMAND = $(LIBTOOL) --mode=finish - -@@ -196,10 +196,10 @@ - $(LIB)/libCQRlib.$(LIB_EXT) \ - $(BIN)/CQRlibTest $(BIN)/CPPQRTest - --install: all $(INSTALLDIR) $(INSTALLDIR)/lib $(INSTALLDIR)/include \ -+install: all $(INSTALLDIR) $(INSTALLDIR)/lib64 $(INSTALLDIR)/include \ - $(INC) $(LIB)/libCQRlib.$(LIB_EXT) $(INC)/cqrlib.h -- $(INSTALL_COMMAND) $(LIB)/libCQRlib.$(LIB_EXT) $(INSTALLDIR)/lib/libCQRlib.$(LIB_EXT) -- $(INSTALL_FINISH_COMMAND) $(INSTALLDIR)/lib/libCQRlib.$(LIB_EXT) -+ $(INSTALL_COMMAND) $(LIB)/libCQRlib.$(LIB_EXT) $(INSTALLDIR)/lib64/libCQRlib.$(LIB_EXT) -+ $(INSTALL_FINISH_COMMAND) $(INSTALLDIR)/lib64/libCQRlib.$(LIB_EXT) - -cp $(INSTALLDIR)/include/cqrlib.h $(INSTALLDIR)/include/CQRlib_old.h - cp $(INC)/cqrlib.h $(INSTALLDIR)/include/cqrlib.h - chmod 644 $(INSTALLDIR)/include/cqrlib.h -@@ -234,8 +234,8 @@ - $(INSTALLDIR): - mkdir -p $(INSTALLDIR) - --$(INSTALLDIR)/lib: $(INSTALLDIR) -- mkdir -p $(INSTALLDIR)/lib -+$(INSTALLDIR)/lib64: $(INSTALLDIR) -+ mkdir -p $(INSTALLDIR)/lib64 - - $(INSTALLDIR)/bin: $(INSTALLDIR) - mkdir -p $(INSTALLDIR)/bin diff --git a/CQRlib-1.1.2-tag.patch b/CQRlib-1.1.2-tag.patch new file mode 100644 index 0000000..7fd7683 --- /dev/null +++ b/CQRlib-1.1.2-tag.patch @@ -0,0 +1,12 @@ +diff -urp CQRlib-1.1.2/Makefile CQRlib-1.1.2-tag/Makefile +--- CQRlib-1.1.2/Makefile 2010-12-22 04:11:09.000000000 +0600 ++++ CQRlib-1.1.2-tag/Makefile 2018-07-22 10:12:03.125481586 +0700 +@@ -93,7 +93,7 @@ BUILD_COMMAND_LOCAL = $(LIBTOOL) -- + BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -dynamic -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib + BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib + CPPCOMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(INCLUDES) $(WARNINGS) -c +-CPPLIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CXX) -version-info $(VERSION) -rpath $(INSTALLDIR)/lib ++CPPLIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CXX) -version-info $(VERSION) -rpath $(INSTALLDIR)/lib --tag CXX + CPPBUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CXX) $(CPPFLAGS) $(INCLUDES) + CPPBUILD_COMMAND_DYNAMIC= $(LIBTOOL) --mode=link $(CXX) $(CPPFLAGS) -dynamic -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib + CPPBUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CXX) $(CPPFLAGS) -static -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib diff --git a/CQRlib.spec b/CQRlib.spec index 4995311..ec8ba9c 100644 --- a/CQRlib.spec +++ b/CQRlib.spec @@ -1,6 +1,6 @@ Name: CQRlib Version: 1.1.2 -Release: 15%{?dist} +Release: 16%{?dist} Summary: ANSI C API for quaternion arithmetic and rotation Group: System Environment/Libraries @@ -9,8 +9,8 @@ URL: http://cqrlib.sourceforge.net/ Source0: http://downloads.sourceforge.net/project/cqrlib/cqrlib/CQRlib-%{version}/CQRlib-%{version}.tar.gz # to fix /-dynamic/-rdynamic/ issue, reported to upstream Patch0: CQRlib-1.0.6-dynamic.patch -# to fix libdir for lib64 architecture -Patch1: CQRlib-1.0.6-lib64.patch +# to fix tag issue +Patch1: CQRlib-1.1.2-tag.patch BuildRequires: gcc-c++ BuildRequires: libtool @@ -31,8 +31,9 @@ developing applications that use CQRlib. %setup -q %patch0 -p1 -b .dynamic +%patch1 -p1 -b .tag %if %{_lib} == lib64 -%patch1 -p1 -b .lib64 +sed -i -e 's,$(INSTALLDIR)/lib,$(INSTALLDIR)/lib64,' -e 's,$(ROOT)/lib,$(ROOT)/lib64,' Makefile %endif %build @@ -63,6 +64,9 @@ make tests %{_libdir}/libCQRlib.so %changelog +* Sun Jul 22 Dmitrij S. kryzhevich - 1.1.2-16 +- Fix libtool tag. + * Thu Jul 12 2018 Fedora Release Engineering - 1.1.2-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild