rpms/liborigin/F-9 liborigin.spec, 1.7, 1.8 sources, 1.3, 1.4 liborigin-include.patch, 1.1, NONE

[Thibault North (tnorth)]

Author: tnorth

Update of /cvs/pkgs/rpms/liborigin/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv638/F-9

Modified Files:
	liborigin.spec sources 
Removed Files:
	liborigin-include.patch 
Log Message:
Rollback to an older version for compatibility issues



Index: liborigin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liborigin/F-9/liborigin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- liborigin.spec	26 Apr 2008 15:46:47 -0000	1.7
+++ liborigin.spec	26 Apr 2008 18:49:44 -0000	1.8
@@ -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 @@
 %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 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README ws4.opj import.qs
+%doc COPYING README
 %{_bindir}/opj2dat
 %{_libdir}/%{name}.so.0*
 
@@ -72,17 +65,8 @@
 %{_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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liborigin/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Apr 2008 15:46:47 -0000	1.3
+++ sources	26 Apr 2008 18:49:44 -0000	1.4
@@ -1 +1 @@
-b498d074623f6bd66fc4b28ac2f6a07e  liborigin-20071119.tar.gz
+5ed1c7c0955f935d3b4e45fb25e1d7fc  liborigin-20070115.tgz


--- liborigin-include.patch DELETED ---