rpms/inchi/devel .cvsignore, 1.2, 1.3 inchi-rpm.patch, 1.1, 1.2 inchi.spec, 1.4, 1.5 sources, 1.2, 1.3

Sun Sep 13 17:26:03 UTC 2009

Author: rathann

Update of /cvs/pkgs/rpms/inchi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11141

Modified Files:
	.cvsignore inchi-rpm.patch inchi.spec sources 
Log Message:
* Wed Aug 26 2009 Dominik Mierzejewski <rpm at greysector.net> 1.0.2-1
- updated to final 1.02 release (unfortunately, it breaks ABI)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inchi/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3

--- .cvsignore	25 Oct 2007 19:28:42 -0000	1.2
+++ .cvsignore	13 Sep 2009 17:26:03 -0000	1.3
@@ -1 +1 @@
-inchi102b.zip
+STDINCHI-1-API.zip

inchi-rpm.patch:
 makefile |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: inchi-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/inchi/devel/inchi-rpm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- inchi-rpm.patch	25 Oct 2007 19:28:42 -0000	1.1
+++ inchi-rpm.patch	13 Sep 2009 17:26:03 -0000	1.2
@@ -1,17 +1,14 @@
---- InChI-1-API/cInChI/gcc_makefile/makefile.r	2006-05-08 19:28:26.000000000 +0200
-+++ InChI-1-API/cInChI/gcc_makefile/makefile	2007-07-01 14:05:00.000000000 +0200
-@@ -31,7 +31,7 @@
+diff -up STDINCHI-1-API/STDINCHI_API/gcc_so_makefile/makefile.r STDINCHI-1-API/STDINCHI_API/gcc_so_makefile/makefile
+--- STDINCHI-1-API/STDINCHI_API/gcc_so_makefile/makefile.r	2008-11-28 19:16:50.000000000 +0100
++++ STDINCHI-1-API/STDINCHI_API/gcc_so_makefile/makefile	2009-08-26 16:02:09.000000000 +0200
+@@ -1,5 +1,5 @@
+ # Comment out the next line to create so/dll only
+-CREATE_MAIN = 1
++#CREATE_MAIN = 1
  
- # === C Compiler Options =======
- ifndef C_OPTIONS
--  C_OPTIONS = $(P_INCL) -ansi -O3 -c
-+  C_OPTIONS = $(P_INCL) -ansi $(OPTFLAGS) -c
- #  C_OPTIONS = $(P_INCL) -ansi -O1 -fsigned-char -ffunction-sections -fexpensive-optimizations -fstack-check -fexceptions -Wall -pedantic -Wbad-function-cast -Wreturn-type -Wformat -Wuninitialized -Wcast-align -Wshadow -Wunused -Wunused-value -Wunused-variable -Wunused-function -Wunused-parameter -Wunused-label -Wcomment -Wcast-qual -Wconversion -Wimplicit-function-dec -Wimplicit-int -Wmissing-braces -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wsign-compare -Wfloat-equal -Wstrict-prototypes -Wwrite-strings -Wundef -Waggregate-return -Wchar-subscripts -Wformat-nonliteral -Wnested-externs -Wsequence-point -Wpointer-arith -m32 -mfancy-math-387 -mieee-fp -mno-soft-float -c
- endif
- 
---- InChI-1-API/INCHI_API/gcc_so_makefile/makefile.r	2006-05-16 18:56:32.000000000 +0200
-+++ InChI-1-API/INCHI_API/gcc_so_makefile/makefile	2007-07-01 14:00:42.000000000 +0200
-@@ -9,7 +9,7 @@
+ ifdef windir
+ # Under Win32/MinGW/gcc to add functions compliant to Pascal/stdcall calling
+@@ -9,7 +9,7 @@ ifdef windir
  else
  # Uncomment the following line in case of Linux
  # or define ISLINUX in command line: make ISLINUX=1
@@ -20,7 +17,7 @@
  endif
  
  # Linux fpic option: replace -fPIC with -fpic if the latter works
-@@ -83,7 +83,7 @@
+@@ -83,7 +83,7 @@ endif
  
  # === C Compiler Options =======
  ifndef C_OPTIONS


Index: inchi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inchi/devel/inchi.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- inchi.spec	25 Jul 2009 03:20:31 -0000	1.4
+++ inchi.spec	13 Sep 2009 17:26:03 -0000	1.5
@@ -3,10 +3,10 @@
 Summary: The IUPAC International Chemical Identifier library
 Name: inchi
 Version: 1.0.2
-Release: 0.5%{?dist}
+Release: 1%{?dist}
 URL: http://www.iupac.org/inchi/
 Group: Development/Libraries
-Source0: http://www.iupac.org/inchi/download/inchi102b.zip
+Source0: http://www.iupac.org/inchi/download/STDINCHI-1-API.zip
 Patch0: %{name}-rpm.patch
 License: LGPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -33,22 +33,23 @@ you should install inchi-devel.  You'll 
 inchi package installed.
 
 %prep
-%setup -q -n InChI-1-software-1-02-beta
+%setup -q -n STDINCHI-1-API
 %patch0 -p1 -b .r
+rm STDINCHI_API/gcc_so_makefile/result/{libstdinchi,stdinchi}*
 
 %build
-pushd INCHI_API/gcc_so_makefile
+pushd STDINCHI_API/gcc_so_makefile
 %{__make} OPTFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT{%{_libdir},%{_includedir}/inchi}
-install -p INCHI_API/gcc_so_makefile/result/libinchi.so.%{inchi_so_ver} $RPM_BUILD_ROOT%{_libdir}
-ln -s libinchi.so.%{inchi_so_ver} $RPM_BUILD_ROOT%{_libdir}/libinchi.so.1
-ln -s libinchi.so.1               $RPM_BUILD_ROOT%{_libdir}/libinchi.so
-sed -i 's/\r//' INCHI_API/INCHI_DLL/inchi_api.h
-install -pm644 INCHI_API/INCHI_DLL/inchi_api.h $RPM_BUILD_ROOT%{_includedir}/inchi
+install -p STDINCHI_API/gcc_so_makefile/result/libstdinchi.so.%{inchi_so_ver} $RPM_BUILD_ROOT%{_libdir}
+ln -s libstdinchi.so.%{inchi_so_ver} $RPM_BUILD_ROOT%{_libdir}/libstdinchi.so.1
+ln -s libstdinchi.so.1               $RPM_BUILD_ROOT%{_libdir}/libstdinchi.so
+sed -i 's/\r//' STDINCHI_API/INCHI_DLL/inchi_api.h
+install -pm644 STDINCHI_API/INCHI_DLL/inchi_api.h $RPM_BUILD_ROOT%{_includedir}/inchi
 sed -i 's/\r//' LICENSE readme.txt
 
 %clean
@@ -60,15 +61,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE readme.txt Software-1-02-beta.pdf
-%{_libdir}/libinchi.so.*
+%doc LICENSE readme.txt
+%{_libdir}/libstdinchi.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/inchi
-%{_libdir}/libinchi.so
+%{_libdir}/libstdinchi.so
 
 %changelog
+* Wed Aug 26 2009 Dominik Mierzejewski <rpm at greysector.net> 1.0.2-1
+- updated to final 1.02 release (unfortunately, it breaks ABI)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-0.5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inchi/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	25 Oct 2007 19:28:42 -0000	1.2
+++ sources	13 Sep 2009 17:26:03 -0000	1.3
@@ -1 +1 @@
-8cf52a73c369bda28de95f4280872e81  inchi102b.zip
+aa8bab9424a4c9683b63706c18d55479  STDINCHI-1-API.zip


