diff --git a/liborigin.spec b/liborigin.spec index 8f68bef..f306361 100644 --- a/liborigin.spec +++ b/liborigin.spec @@ -1,15 +1,16 @@ Name: liborigin -Version: 20070115 -Release: 4%{?dist} +Version: 20071119 +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 +30,24 @@ 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}/ + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -55,7 +57,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,6 +67,11 @@ sed -i "s|/usr/lib|/usr/lib64|" Makefile.LINUX %{_libdir}/%{name}.so %changelog +* Fri Jan 18 2008 Chitlesh Goorah - 20071119-1 +- New upstream release +- fix for hardcoded path of %%{_libdir} +- opted cmake during the build process + * Thu Aug 23 2007 Chitlesh Goorah - 20070115-4 - queued for mass rebuild for Fedora 8 - BuildID diff --git a/sources b/sources index 5a0dab2..213f2d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5ed1c7c0955f935d3b4e45fb25e1d7fc liborigin-20070115.tgz +ba5f2a1ee31089f78c2661e5ce4a3c54 liborigin-20071119.tar.gz