From e3e84f4ed54262203ece8bcfd0c11645c80c3196 Mon Sep 17 00:00:00 2001 From: Takanori MATSUURA Date: Oct 14 2010 06:30:03 +0000 Subject: Initial import (#545045). --- diff --git a/.gitignore b/.gitignore index e69de29..8000ed2 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/CQRlib-1.1.1.tar.gz diff --git a/CQRlib-1.0.6-dynamic.patch b/CQRlib-1.0.6-dynamic.patch new file mode 100644 index 0000000..3433337 --- /dev/null +++ b/CQRlib-1.0.6-dynamic.patch @@ -0,0 +1,17 @@ +--- CQRlib-1.0.6/Makefile.dynamic 2010-07-23 04:40:10.000000000 +0900 ++++ CQRlib-1.0.6/Makefile 2010-08-25 20:38:56.991145821 +0900 +@@ -90,12 +90,12 @@ + COMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c + LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -rpath $(INSTALLDIR)/lib + BUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES) +-BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -dynamic -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib ++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 + CPPCOMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(INCLUDES) $(WARNINGS) -c + CPPLIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CXX) -version-info $(VERSION) -rpath $(INSTALLDIR)/lib + 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_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 + INSTALL_COMMAND = $(LIBTOOL) --mode=install cp + INSTALL_FINISH_COMMAND = $(LIBTOOL) --mode=finish diff --git a/CQRlib-1.0.6-lib64.patch b/CQRlib-1.0.6-lib64.patch new file mode 100644 index 0000000..243a7c4 --- /dev/null +++ b/CQRlib-1.0.6-lib64.patch @@ -0,0 +1,58 @@ +--- 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.spec b/CQRlib.spec new file mode 100644 index 0000000..3c95dcc --- /dev/null +++ b/CQRlib.spec @@ -0,0 +1,96 @@ +Name: CQRlib +Version: 1.1.1 +Release: 0.1%{?dist} +Summary: ANSI C API for quaternion arithmetic and rotation + +Group: System Environment/Libraries +License: LGPLv2+ +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 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: libtool + +%description +CQRlib is an ANSI C implementation of a utility library for quaternion +arithmetic and quaternion rotation math. + +%package devel +Summary: Development tools for compiling programs using CQRlib +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +The CQRlib-devel package includes the header and library files for +developing applications that use CQRlib. + +%prep +%setup -q + +%patch0 -p1 -b .dynamic +%if %{_lib} == lib64 +%patch1 -p1 -b .lib64 +%endif + +%build +make CFLAGS="%{optflags}" %{?_smp_mflags} + +%install +rm -rf %{buildroot} + +make install CFLAGS="%{optflags}" INSTALLDIR="%{buildroot}%{_prefix}" + +# remove .la and .a files +find %{buildroot} -name '*.la' -exec rm -f {} ';' +find %{buildroot} -name '*.a' -exec rm -f {} ';' + +%clean +rm -rf %{buildroot} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc README_CQRlib.html README_CQRlib.txt lgpl.txt +%{_libdir}/libCQRlib.so.* + +%files devel +%defattr(-,root,root,-) +%{_includedir}/cqrlib.h +%{_libdir}/libCQRlib.so + +%changelog +* Tue Oct 12 2010 Takanori MATSUURA - 1.1.1-0.1 +- use %%{_lib} detection to fix W: %%ifarch-applied-patch + +* Thu Sep 30 2010 Takanori MATSUURA - 1.1.1-0 +- update to 1.1.1 + +* Fri Sep 10 2010 Takanori MATSUURA - 1.1-0 +- update to 1.1 + +* Mon Aug 30 2010 Takanori MATSUURA - 1.0.6-1 +- update to 1.0.6 +- provide 64 bit libdir fix as a patch +- provide s/dynamic/rsynamic/g as a patch + +* Thu May 6 2010 Takanori MATSUURA - 1.0.5-1 +- update to 1.0.5 + +* Wed Dec 9 2009 Takanori MATSUURA - 1.0.3-3.20090805 +- remove static library + +* Tue Dec 8 2009 Takanori MATSUURA - 1.0.3-2.20090805 +- fit to Fedora Packaging Guidelines +- apply changes pointed at rhbz #545045 comment #1 + +* Tue Aug 25 2009 Takanori MATSUURA - 1.0.3-1.20090805 +- update to 1.0.3-5Aug09 + +* Wed Jul 29 2009 Takanori MATSUURA - 1.0.3-1 +- initial build diff --git a/sources b/sources index e69de29..bae3b7a 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +e7c6cf0d50092309df3f6c31d75dabf0 CQRlib-1.1.1.tar.gz