From 8c1dddcb2286e29b43005a247b34a598d5b2e259 Mon Sep 17 00:00:00 2001
From: Thibault North <tnorth@fedoraproject.org>
Date: Apr 26 2008 18:49:44 +0000
Subject: Rollback to an older version for compatibility issues


---

diff --git a/liborigin-include.patch b/liborigin-include.patch
deleted file mode 100644
index a2bcfca..0000000
--- a/liborigin-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- OPJFile.cpp.orig	2008-04-20 08:50:26.000000000 +0200
-+++ OPJFile.cpp	2008-04-20 08:51:26.000000000 +0200
-@@ -31,6 +31,7 @@
- #include <iostream>
- #include <stdlib.h>
- #include <math.h>
-+#include <string.h>
- 
- #include <algorithm> //required for std::swap
- #include "OPJFile.h"
diff --git a/liborigin.spec b/liborigin.spec
index 825b900..db06bd6 100644
--- a/liborigin.spec
+++ b/liborigin.spec
@@ -1,19 +1,15 @@
 Name:      liborigin
-Version:   20071119
-Release:   3%{?dist}
+Version:   20070115
+Release:   5%{?dist}
 Summary:   Library for reading OriginLab OPJ project files
 
 License:   GPLv2
 Group:     Development/Libraries
 URL:       http://sourceforge.net/projects/%{name}/
 
-Source:    http://belnet.dl.sourceforge.net/sourceforge/liborigin/%{name}-%{version}.tar.gz
-
-Patch0:	   %{name}-include.patch
-
+Source:    http://belnet.dl.sourceforge.net/sourceforge/liborigin/%{name}-%{version}.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: cmake
 Requires(post):    /sbin/ldconfig
 Requires(postun):  /sbin/ldconfig
 
@@ -33,26 +29,23 @@ you will need to install %{name}-devel.
 %prep
 %setup -q
 
-%patch0 -p0 -b .include
+sed -i "s|chmod ugo-x|chmod ugo+x|" Makefile.LINUX
+sed -i "s|.so.0.0.0|.so.0.0.1|" Makefile.LINUX
+sed -i "s|= -pipe|= -pipe $RPM_OPT_FLAGS|" Makefile.LINUX
 
 %build
 
 # fix for hardcoded path of %{_libdir}
 %ifarch x86_64 sparc64 ppc64 amd64
-%{__sed} -i "s|install(TARGETS origin DESTINATION lib)|install(TARGETS origin DESTINATION lib64)|" CMakeLists.txt
+sed -i "s|/usr/lib|/usr/lib64|" Makefile.LINUX
 %endif
 
-%cmake
-
-%{__make} VERBOSE=1 %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} INSTALL="install -p" DESTDIR=%{buildroot} install
 
-install -d  %{buildroot}%{_includedir}/%{name}/
-install -pm 644 OPJFile.h tree.hh %{buildroot}%{_includedir}/%{name}/
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -62,7 +55,7 @@ install -pm 644 OPJFile.h tree.hh %{buildroot}%{_includedir}/%{name}/
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README ws4.opj import.qs
+%doc COPYING README
 %{_bindir}/opj2dat
 %{_libdir}/%{name}.so.0*
 
@@ -72,17 +65,8 @@ install -pm 644 OPJFile.h tree.hh %{buildroot}%{_includedir}/%{name}/
 %{_libdir}/%{name}.so
 
 %changelog
-* Sat Apr 26 2008 Thibault North <tnorth [AT] fedoraproject DOT org> - 20070119-3
-- now uses again version 20070119
-- patch for successful rebuild with gcc4.3
-
-* Mon Apr 21 2008 Thibault North <tnorth [AT] fedoraproject DOT org> - 20070115-2
-- rebuild for F9 with optimized gcc4.3 extensions
-
-* Fri Jan 18 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20071119-1
-- New upstream release
-- fix for hardcoded path of %%{_libdir}
-- opted cmake during the build process
+* Sat Apr 26 2008 Thibault North <tnorth [AT] fedoraproject DOT org> - 20070115-5
+- Rollback to 20070115 for compatibility issues.
 
 * Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070115-4
 - queued for mass rebuild for Fedora 8 - BuildID
diff --git a/sources b/sources
index fc2b45a..5a0dab2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b498d074623f6bd66fc4b28ac2f6a07e  liborigin-20071119.tar.gz
+5ed1c7c0955f935d3b4e45fb25e1d7fc  liborigin-20070115.tgz