[CVector/f14/master] 1.0.7-1.5Aug09

[Takanori MATSUURA]

commit 8a3e9f5fb5e462807fb73c96c599cca7955b81e4
Author: Takanori MATSUURA <t.matsuu at gmail.com>
Date:   Wed Sep 1 18:52:23 2010 +0900

    1.0.7-1.5Aug09

 CVector-1.0.3-dynamic.patch |    8 ++++----
 CVector-1.0.3-lib64.patch   |    6 +++---
 CVector.spec                |   22 +++++++++++++---------
 3 files changed, 20 insertions(+), 16 deletions(-)
---
diff --git a/CVector-1.0.3-dynamic.patch b/CVector-1.0.3-dynamic.patch
index c579766..a2de630 100644
--- a/CVector-1.0.3-dynamic.patch
+++ b/CVector-1.0.3-dynamic.patch
@@ -1,11 +1,11 @@
---- CVector-1.0.3/Makefile.dynamic	2010-09-01 14:20:54.348867963 +0900
-+++ CVector-1.0.3/Makefile	2010-09-01 14:21:11.166820743 +0900
+--- CVector-1.0.3/Makefile.dynamic	2009-07-08 11:02:56.000000000 +0900
++++ CVector-1.0.3/Makefile	2010-09-01 18:41:28.249819885 +0900
 @@ -91,7 +91,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)/lib64
+ 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) -shared -I $(INSTALL_PREFIX)/include
-+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-lib64.patch b/CVector-1.0.3-lib64.patch
index 157ffd8..fc6df99 100644
--- a/CVector-1.0.3-lib64.patch
+++ b/CVector-1.0.3-lib64.patch
@@ -1,5 +1,5 @@
---- CVector-1.0.3/Makefile.lib64	2009-07-08 11:02:56.000000000 +0900
-+++ CVector-1.0.3/Makefile	2010-08-30 18:42:52.635278894 +0900
+--- CVector-1.0.3/Makefile.lib64	2010-09-01 18:41:28.249819885 +0900
++++ CVector-1.0.3/Makefile	2010-09-01 18:42:23.056864943 +0900
 @@ -68,7 +68,7 @@
  # Directories
  #
@@ -16,7 +16,7 @@
 -LIBRARY_LINK_COMMAND   =  $(LIBTOOL) --mode=link  $(CC) -version-info $(VERSION) -release $(RELEASE) -no-undefined -rpath $(INSTALL_PREFIX)/lib
 +LIBRARY_LINK_COMMAND   =  $(LIBTOOL) --mode=link  $(CC) -version-info $(VERSION) -release $(RELEASE) -no-undefined -rpath $(INSTALL_PREFIX)/lib64
  BUILD_COMMAND_LOCAL    =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES)
- BUILD_COMMAND_DYNAMIC  =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -shared -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
 @@ -184,22 +184,22 @@
  		$(LIB)/libCVector.$(LIB_EXT) \
diff --git a/CVector.spec b/CVector.spec
index 3f6bb40..35dbc71 100644
--- a/CVector.spec
+++ b/CVector.spec
@@ -1,9 +1,9 @@
 %global release_date 5Aug09
-%{!?release_func:%global release_func() %%{?release_date:0.}%1%%{?release_date:.%%release_date}%%{?dist}}
+%{!?release_func:%global release_func() %1%%{?release_date:.%%release_date}%%{?dist}}
 
 Name:           CVector
 Version:        1.0.3
-Release:        %release_func 7
+Release:        %release_func 1
 Summary:        ANSI C API for Dynamic Arrays
 
 Group:          System Environment/Libraries
@@ -14,10 +14,10 @@ Source0:        http://downloads.sourceforge.net/project/cvector/cvector/CVector
 %else
 Source0:        http://downloads.sourceforge.net/project/cvector/cvector/CVector-%{version}/CVector-%{version}.tar.gz
 %endif
+# to generate PIC on 5E-epel, reported upstream
+Patch0:         CVector-1.0.3-dynamic.patch
 # to fix libdir for lib64 architecture
-Patch0:         CVector-1.0.3-lib64.patch
-# to generate PIC
-Patch1:         CVector-1.0.3-dynamic.patch
+Patch1:         CVector-1.0.3-lib64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libtool
@@ -37,8 +37,9 @@ developing applications that use CVector.
 
 %prep
 %setup -q
+%patch0 -p1 -b .dynamic
 %ifarch x86_64 ppc64 s390x
-%patch0 -p1 -b .lib64
+%patch1 -p1 -b .lib64
 %endif
 
 %build
@@ -71,13 +72,16 @@ rm -rf %{buildroot}
 %{_libdir}/libCVector.so
 
 %changelog
-* Tue Sep  1 2010 Takanori MATSUURA <t.matsuu at gmail.com> - 1.0.3-7.5Aug09
+* Tue Sep  1 2010 Takanori MATSUURA <t.matsuu at gmail.com> - 1.0.3-1.5Aug09
+- initial release
+
+* Tue Sep  1 2010 Takanori MATSUURA <t.matsuu at gmail.com> - 1.0.3-0.7.5Aug09
 - use "-rdynamic" instead of "-shared"
 
-* Tue Sep  1 2010 Takanori MATSUURA <t.matsuu at gmail.com> - 1.0.3-6.5Aug09
+* Tue Sep  1 2010 Takanori MATSUURA <t.matsuu at gmail.com> - 1.0.3-0.6.5Aug09
 - initial import for Fedora (#545046)
 
-* Mon Aug 30 2010 Takanori MATSUURA <t.matsuu at gmail.com> - 1.0.3-5.5Aug09
+* Mon Aug 30 2010 Takanori MATSUURA <t.matsuu at gmail.com> - 1.0.3-0.5.5Aug09
 - change release versioning scheme
 - provide 64 bit libdir fix as a patch
 - remove useless s/dynamic/rsynamic/g