[inchi] update to 1.04

[Dominik Mierzejewski]

commit 174f45b4d9279c06f45528ffd41eea749bf4abce
Author: Dominik Mierzejewski <rpm at greysector.net>
Date:   Wed Oct 12 18:37:01 2011 +0200

    update to 1.04
    
    - update to 1.04
    - update homepage and source URLs
    - use dos2unix for EOL conversion

 .gitignore |    2 ++
 inchi.spec |   27 +++++++++++++++++----------
 sources    |    4 ++--
 3 files changed, 21 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b45c211..0d67c5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 INCHI-1-API.zip
 INCHI-1-DOC.zip
+/INCHI-1-API.ZIP
+/INCHI-1-DOC.ZIP
diff --git a/inchi.spec b/inchi.spec
index c10c27b..8214fac 100644
--- a/inchi.spec
+++ b/inchi.spec
@@ -1,17 +1,18 @@
-%define inchi_so_ver 1.03.00
-%define url_ver 1.03
+%define inchi_so_ver 1.04.00
+%define url_ver 1.04
 
 Summary: The IUPAC International Chemical Identifier library
 Name: inchi
-Version: 1.0.3
-Release: 2%{?dist}
-URL: http://www.iupac.org/inchi/
+Version: 1.0.4
+Release: 1%{?dist}
+URL: http://www.inchi-trust.org/?q=node/14
 Group: Development/Libraries
-Source0: http://www.iupac.org/inchi/download/version%{url_ver}/INCHI-1-API.zip
-Source1: http://www.iupac.org/inchi/download/version%{url_ver}/INCHI-1-DOC.zip
+Source0: http://www.inchi-trust.org/sites/default/files/inchi-%{url_ver}/INCHI-1-API.ZIP
+Source1: http://www.inchi-trust.org/sites/default/files/inchi-%{url_ver}/INCHI-1-DOC.ZIP
 Patch0: %{name}-rpm.patch
 License: LGPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: dos2unix
 
 %description
 The IUPAC International Chemical Identifier (InChITM) is a non-proprietary
@@ -48,6 +49,9 @@ and InChI library API reference for developers.
 %setup -q -n INCHI-1-API -a 1
 %patch0 -p1 -b .r
 rm INCHI_API/gcc_so_makefile/result/{libinchi,inchi}*
+for file in INCHI_API/inchi_dll/inchi_api.h LICENCE readme.txt ; do
+  dos2unix -k $file
+done
 
 %build
 pushd INCHI_API/gcc_so_makefile
@@ -60,9 +64,7 @@ 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
-sed -i 's/\r//' LICENSE readme.txt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -73,7 +75,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE readme.txt
+%doc LICENCE readme.txt
 %{_libdir}/libinchi.so.*
 
 %files devel
@@ -86,6 +88,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc INCHI-1-DOC/*
 
 %changelog
+* Wed Oct 12 2011 Dominik Mierzejewski <rpm at greysector.net> 1.0.4-1
+- update to 1.04
+- update homepage and source URLs
+- use dos2unix for EOL conversion
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 161e794..ccfafdd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-7dd26285418528172326aa32f9a19ba3  INCHI-1-API.zip
-6a380e9b1ac8b963b66304e1c16a31bb  INCHI-1-DOC.zip
+0d3c6391e90ed0a2eee6ebb050a66581  INCHI-1-API.ZIP
+dc5af0f4d65bd15b283a8a9ce673c7a3  INCHI-1-DOC.ZIP