dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: yafray
-# $Id$
-NAME := yafray
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

yafray.spec

@@ -1,37 +1,29 @@
 Name:           yafray
 Version:        0.0.9
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Yet Another Free RAYtracer
 
 Group:          Applications/Multimedia
 License:        LGPLv2+
 URL:            http://www.yafray.org
 Source:		http://www.yafray.org/sec/2/downloads/yafray-%{version}.tar.gz
-Patch0:		yafray-0.0.9-soname.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	zlib-devel
 BuildRequires:	libjpeg-devel
-BuildRequires:	OpenEXR-devel >= 1.6.0
+BuildRequires:	OpenEXR-devel
 BuildRequires:	scons
 
+Obsoletes: yafray-devel
+
+
 %description
 Yafray is yet another free raytracer, still in development. Some
 features like caustics, filters, depth of field, etc. are implemented.
 
 
-%package        devel
-Summary:        Development files for %{name}
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description    devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
-
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1 -b .soname
 #sed -i "s|/usr/local|%{_prefix}|" linux-settings.py
 sed -i "s|flags='|flags='$RPM_OPT_FLAGS |" linux-settings.py
 sed -i "s|/lib|/%{_lib}|" linux-settings.py
@@ -53,11 +45,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/yafray/.sconsign
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
 install -pm 0644 $RPM_BUILD_ROOT%{_prefix}/etc/gram.yafray $RPM_BUILD_ROOT%{_sysconfdir}
 rm -rf $RPM_BUILD_ROOT%{_prefix}/etc
-for i in libyafraycore libyafrayplugin ;do
-  mv $RPM_BUILD_ROOT%{_libdir}/$i.so $RPM_BUILD_ROOT%{_libdir}/$i.so.%{version}
-  ln -fs $i.so.%{version} $RPM_BUILD_ROOT%{_libdir}/$i.so.0
-  ln -fs $i.so.%{version} $RPM_BUILD_ROOT%{_libdir}/$i.so
-done
 
 
 %clean
@@ -74,17 +61,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc ChangeLog AUTHORS LICENSE README
 %{_bindir}/yafray
-%{_libdir}/lib*.so.*
+%{_libdir}/lib*.so
 %{_libdir}/yafray/
 %config(noreplace) %{_sysconfdir}/gram.yafray
 
-%files devel
-%defattr(-,root,root,-)
-%doc ChangeLog AUTHORS LICENSE README
-%{_libdir}/lib*.so
 
 
 %changelog
+* Mon Oct 15 2007 kwizart < kwizart at gmail.com > - 0.0.9-5
+- Fix: yafray libs are dlopened
+
 * Mon Oct 15 2007 kwizart < kwizart at gmail.com > - 0.0.9-4
 - Rebuild