[CVector] - update to 1.0.3.1 - use "make all" instead of "make" - add %check
tmatsuu
tmatsuu at fedoraproject.org
Tue Oct 26 06:21:53 UTC 2010
commit 9765412c3459fffea2b238f4a8039f8bd9db5b14
Author: Takanori MATSUURA <t.matsuu at gmail.com>
Date: Tue Oct 26 15:21:02 2010 +0900
- update to 1.0.3.1
- use "make all" instead of "make"
- add %check
CVector-1.0.3.1-dynamic.patch | 33 +++++++++++++++++++++++++++++++++
CVector-1.0.3.1.tar.gz | Bin 0 -> 19761 bytes
CVector.spec | 21 +++++++++++++++------
3 files changed, 48 insertions(+), 6 deletions(-)
---
diff --git a/CVector-1.0.3.1-dynamic.patch b/CVector-1.0.3.1-dynamic.patch
new file mode 100644
index 0000000..cd879e2
--- /dev/null
+++ b/CVector-1.0.3.1-dynamic.patch
@@ -0,0 +1,33 @@
+--- CVector-1.0.3.1/Makefile.orig 2010-09-01 23:10:52.000000000 +0900
++++ CVector-1.0.3.1/Makefile 2010-09-02 11:43:23.000000000 +0900
+@@ -39,6 +39,8 @@
+ VERSION = 2:0:0
+ RELEASE = 1.0.3
+
++# get OSTYPE
++OSTYPE=$(shell uname -s)
+
+ #
+ # Compiler and compilation flags
+@@ -56,7 +58,11 @@
+ #
+ #LIBTOOL = $(HOME)/bin/libtool
+ ifndef LIBTOOL
+- LIBTOOL = libtool
++ifeq ($(OSTYPE),Darwin)
++LIBTOOL = glibtool
++else
++LIBTOOL = libtool
++endif
+ endif
+
+ #
+@@ -92,7 +98,7 @@
+ COMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
+ LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -release $(RELEASE) -no-undefined -rpath $(INSTALL_PREFIX)/lib
+ BUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES)
+-BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -dynamic -I $(INSTALL_PREFIX)/include
++BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rdynamic -I $(INSTALL_PREFIX)/include
+ BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static -I $(INSTALL_PREFIX)/include
+ INSTALL_COMMAND = $(LIBTOOL) --mode=install cp
+ INSTALL_FINISH_COMMAND = $(LIBTOOL) --mode=finish
diff --git a/CVector-1.0.3.1.tar.gz b/CVector-1.0.3.1.tar.gz
new file mode 100644
index 0000000..f21205d
Binary files /dev/null and b/CVector-1.0.3.1.tar.gz differ
diff --git a/CVector.spec b/CVector.spec
index 35dbc71..0b2647f 100644
--- a/CVector.spec
+++ b/CVector.spec
@@ -1,8 +1,9 @@
-%global release_date 5Aug09
+#global release_date 5Aug09
%{!?release_func:%global release_func() %1%%{?release_date:.%%release_date}%%{?dist}}
+%define version_number 1.0.3
Name: CVector
-Version: 1.0.3
+Version: %{version_number}.1
Release: %release_func 1
Summary: ANSI C API for Dynamic Arrays
@@ -12,10 +13,10 @@ URL: http://cvector.sourceforge.net/
%if 0%{?release_date:1}
Source0: http://downloads.sourceforge.net/project/cvector/cvector/CVector-%{version}/CVector-%{version}-%{release_date}.tar.gz
%else
-Source0: http://downloads.sourceforge.net/project/cvector/cvector/CVector-%{version}/CVector-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/project/cvector/cvector/CVector-1.0.3/CVector-%{version}.tar.gz
%endif
-# to generate PIC on 5E-epel, reported upstream
-Patch0: CVector-1.0.3-dynamic.patch
+# to fix /-dynamic/-rdynamic/ issue, reported to upstream
+Patch0: CVector-1.0.3.1-dynamic.patch
# to fix libdir for lib64 architecture
Patch1: CVector-1.0.3-lib64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,6 +55,9 @@ make install CFLAGS="%{optflags}" INSTALL_PREFIX="%{buildroot}%{_prefix}"
find %{buildroot} -name '*.la' -exec rm -f {} ';'
find %{buildroot} -name '*.a' -exec rm -f {} ';'
+%check
+make tests
+
%clean
rm -rf %{buildroot}
@@ -64,7 +68,7 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc README_CVector.html README_CVector.txt lgpl.txt
-%{_libdir}/libCVector-%{version}.so.*
+%{_libdir}/libCVector-%{version_number}.so.*
%files devel
%defattr(-,root,root,-)
@@ -72,6 +76,11 @@ rm -rf %{buildroot}
%{_libdir}/libCVector.so
%changelog
+* Tue Oct 26 2010 Takanori MATSUURA <t.matsuu at gmail.com> - 1.0.3.1-1
+- update to 1.0.3.1
+- use "make all" instead of "make"
+- add %%check
+
* Tue Sep 1 2010 Takanori MATSUURA <t.matsuu at gmail.com> - 1.0.3-1.5Aug09
- initial release
More information about the scm-commits
mailing list