- Update to latest upstream (1.4.3)bibus-1_4_3-1_fc10F-10-startF-10-split

- Make package arch-specific to allow package to find appropriate location
    for x86_64 (#438527)
- Fix PNG corruption introduced by fixing line-feeds, patch thanks to
    Nicolas Thierry-Mieg (#448483)
- Add missing images to doc

3 files changed, 28 insertions, 8 deletions

diff --git a/.cvsignore b/.cvsignore
index b26beda..460cd4e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-bibus_1.4.1-1.tar.gz
+bibus_1.4.3-2.tar.gz
diff --git a/bibus.spec b/bibus.spec
index 0b1c040..84865f0 100644
--- a/bibus.spec
+++ b/bibus.spec
@@ -1,15 +1,19 @@
 Name:           bibus
-Version:        1.4.1
-Release:        4%{?dist}
+Version:        1.4.3
+Release:        1%{?dist}
 Summary:        Bibliographic and reference management software
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://bibus-biblio.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/bibus-biblio/%{name}_%{version}-1.tar.gz
+Source0:        http://downloads.sourceforge.net/bibus-biblio/%{name}_%{version}-2.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
+## temporarily removing noarch to workaround this bug:
+##  https://bugzilla.redhat.com/show_bug.cgi?id=438527
+## also filed with bibus upstream: 
+##  http://sourceforge.net/tracker/index.php?func=detail&aid=1989580&group_id=110943&atid=657832
+##BuildArch:      noarch
 
 BuildRequires:  python-devel
 BuildRequires:  desktop-file-utils
@@ -28,7 +32,7 @@ OpenOffice.org and MS Word and generate the bibliographic index.
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}1.4
 
 ## make files UTF-8 
 for i in bibMSW.htm eTBlast\ Interface\ to\ Bibus.htm
@@ -36,8 +40,12 @@ do
   /usr/bin/iconv -f iso8859-1 -t utf-8 "Docs/html/en/${i}" > "Docs/html/en/${i}.conv" && /bin/mv -f "Docs/html/en/${i}.conv" "Docs/html/en/${i}"
 done
 
+## remove all CVS version control files
+find . -type d -name CVS -print0 | xargs --null rm -rf
+
 ##  fix line endings
-find Docs -type f -exec sed -i 's/\r//' {} 2>/dev/null ';'
+##find Docs -type f -exec sed -i 's/\r//' {} 2>/dev/null ';'
+find Docs -type f -name '*ml' -exec sed -i 's/\r//' {} 2>/dev/null ';'
 
 ## remove she-bang lines in .py files to keep rpmlint happy
 find . -type f -name "*.py" -exec sed -i '/^#![ ]*\/usr\/bin\/.*$/ d' {} 2>/dev/null ';'
@@ -61,6 +69,10 @@ ln -s %{_datadir}/%{name}/bibusStart.py $RPM_BUILD_ROOT%{_bindir}/bibus
 ## fix location of doc directory to include version
 mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
 
+## also install ScreenShots subdirectory, missed by Makefile
+install -d $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}/html/ScreenShots/
+install -m644 Docs/html/ScreenShots/*.png $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}/html/ScreenShots/
+
 ## fix bibus.cfg to remove $RPM_BUILD_ROOT
 sed -i "s:$RPM_BUILD_ROOT::" $RPM_BUILD_ROOT%{_datadir}/%{name}/bibus.cfg
 
@@ -99,6 +111,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun 10 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.3-1
+- Update to latest upstream (1.4.3)
+- Make package arch-specific to allow package to find appropriate location
+  for x86_64 (#438527)
+- Fix PNG corruption introduced by fixing line-feeds, patch thanks to 
+  Nicolas Thierry-Mieg (#448483)
+- Add missing images to doc
+
 * Thu Mar 13 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.1-4
 - Require python-sqlite2, not sqlite
 
diff --git a/sources b/sources
index 54edba5..7b30d26 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-22b91fb9daf1e002e521e6315ade7b28  bibus_1.4.1-1.tar.gz
+8e1e13469fa4099c384009a0350c926a  bibus_1.4.3-2.tar.gz