From bf48fa09f33c978d30061d70e1fbdac45b969e5f Mon Sep 17 00:00:00 2001
From: Chitlesh GOORAH <chitlesh@fedoraproject.org>
Date: Nov 11 2008 21:06:26 +0000
Subject: 


---

diff --git a/import.log b/import.log
new file mode 100644
index 0000000..e46c5e9
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+liborigin-20080225-1_fc10:F-9:liborigin-20080225-1.fc10.src.rpm:1226437518
diff --git a/liborigin.spec b/liborigin.spec
index db06bd6..4ead6f3 100644
--- a/liborigin.spec
+++ b/liborigin.spec
@@ -1,15 +1,17 @@
 Name:      liborigin
-Version:   20070115
-Release:   5%{?dist}
+Version:   20080225
+Release:   1%{?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}.tgz
+Source:    http://belnet.dl.sourceforge.net/sourceforge/liborigin/%{name}-%{version}.tar.gz
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires: cmake
 Requires(post):    /sbin/ldconfig
 Requires(postun):  /sbin/ldconfig
 
@@ -29,23 +31,27 @@ you will need to install %{name}-devel.
 %prep
 %setup -q
 
-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|/usr/lib|/usr/lib64|" Makefile.LINUX
+%{__sed} -i "s|install(TARGETS origin DESTINATION lib)|install(TARGETS origin DESTINATION lib64)|" CMakeLists.txt
 %endif
 
-%{__make} %{?_smp_mflags}
+%cmake
+
+%{__make} VERBOSE=1 %{?_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}/
+
+#W: spurious-executable-perm 
+chmod 0644 ws4.opj
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -55,7 +61,7 @@ sed -i "s|/usr/lib|/usr/lib64|" Makefile.LINUX
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README
+%doc COPYING README ws4.opj import.qs
 %{_bindir}/opj2dat
 %{_libdir}/%{name}.so.0*
 
@@ -65,8 +71,20 @@ sed -i "s|/usr/lib|/usr/lib64|" Makefile.LINUX
 %{_libdir}/%{name}.so
 
 %changelog
-* Sat Apr 26 2008 Thibault North <tnorth [AT] fedoraproject DOT org> - 20070115-5
-- Rollback to 20070115 for compatibility issues.
+* Tue Jun 10 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20080225-1
+- New upstream release 20080225
+
+* 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
 
 * 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 5a0dab2..dd7bed2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5ed1c7c0955f935d3b4e45fb25e1d7fc  liborigin-20070115.tgz
+5b7c6f22173a9d97c4f0dbec8671ac83  liborigin-20080225.tar.gz