rpms/lib3ds/F-7 .cvsignore, 1.3, 1.4 lib3ds.spec, 1.14, 1.15 sources, 1.3, 1.4

[Ralf Corsépius (corsepiu)]

Author: corsepiu

Update of /cvs/pkgs/rpms/lib3ds/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11695

Modified Files:
	.cvsignore lib3ds.spec sources 
Log Message:
* Sat Nov 03 2007 Ralf Corsépius <rc040203 at freenet.de> - 1.3.0-1
- Cleanup spec.
- Add post/postun.
- Re-add 3ds2m for fedora < 9.
- Abandon *-static for fedora >= 9.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lib3ds/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Jan 2006 14:07:47 -0000	1.3
+++ .cvsignore	3 Nov 2007 07:34:31 -0000	1.4
@@ -1,2 +1 @@
-lib3ds-1.2.0.tar.gz
-lib3ds-cvs-20060105.diff
+lib3ds-1.3.0.zip


Index: lib3ds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lib3ds/F-7/lib3ds.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- lib3ds.spec	20 Oct 2007 02:54:57 -0000	1.14
+++ lib3ds.spec	3 Nov 2007 07:34:31 -0000	1.15
@@ -1,15 +1,16 @@
 Name:           lib3ds
-Version:        1.2.0
-Release:        12%{?dist}
+Version:        1.3.0
+Release:        1%{?dist}
 
 Summary:        3D Studio file format library
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://lib3ds.sourceforge.net
-Source:         http://downloads.sourceforge.net/lib3ds/lib3ds-%{version}.tar.gz
-Patch0:         lib3ds-1.2.0.diff
-Patch1:         lib3ds-cvs-20060105.diff
+Source:         http://downloads.sourceforge.net/lib3ds/lib3ds-%{version}.zip
+Patch2:         lib3ds-1.2.0-pkgconfig.diff
+Patch3:         lib3ds-1.3.0-3ds2m.diff
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -35,44 +36,108 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_bindir}/3dsdump
-%{_bindir}/3ds2m
 %{_mandir}/man1/3dsdump.1*
+%if "%{?fedora}" < "9"
+%{_bindir}/3ds2m
 %{_mandir}/man1/3ds2m.1*
+%endif
 
 %package        devel
 Summary:        %summary
 Group:          Development/Libraries
-Provides:	lib3ds-static = %{version}-%{release}
+Requires:	pkgconfig
+Requires:	lib3ds = %{version}-%{release}
 
 %description    devel
 Development files for lib3ds
 
+%if "%{?fedora}" < "9"
+%package        static
+Summary:        %summary
+Group:          Development/Libraries
+Requires:	lib3ds-devel = %{version}-%{release}
+
+%description    static
+Static development files for lib3ds
+%endif
+
 %prep
 %setup -q
-%patch -p1 -P 0
-%patch -p2 -P 1
+%patch -p1 -P 2
+
+%if "%{?fedora}" < "9"
+%patch -p1 -P 3
+%endif
 
 %build
-%configure
+%configure \
+%if "%{?fedora}" >= "9"
+  --disable-static
+%endif
+
 make %{?_smp_mflags}
 
+sed -e 's, at prefix@,%{_prefix},' \
+  -e 's, at exec_prefix@,%{_exec_prefix},' \
+  -e 's, at libdir@,%{_libdir},' \
+  -e 's, at includedir@,%{_includedir},' \
+  -e 's, at VERSION@,%{version},' \
+  lib3ds.pc.in > lib3ds.pc
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+install -d ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig
+install lib3ds.pc -m 0644 ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig
+
+## Remove libtool archive
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files devel
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
-%{_bindir}/lib3ds-config
+%{_libdir}/*.so.*
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%if "%{?fedora}" < "9"
+%files static
 %{_libdir}/*.a
+%endif
+
+
+%files devel
+%defattr(-,root,root,-)
+%{_bindir}/lib3ds-config
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/lib3ds.pc
 %{_mandir}/man1/lib3ds-config.1*
 %{_includedir}/lib3ds
 %{_datadir}/aclocal/*
 
 %changelog
+* Sat Nov 03 2007 Ralf Corsépius <rc040203 at freenet.de> - 1.3.0-1
+- Cleanup spec.
+- Add post/postun.
+- Re-add 3ds2m for fedora < 9.
+- Abandon *-static for fedora >= 9.
+
+* Fri Nov 02 2007 Xavier Lamien <lxtnow[at]gmail.com> - 1.3.0
+- Updated Release.
+
+* Sun Oct 21 2007 Ralf Corsépius <rc040203 at freenet.de> - 1.2.0-13
+- Address BZ 341851:
+  - Add lib3ds.pc.
+  - Rework lib3ds-config to using lib3ds.pc.
+  - Add lib3ds-1.2.0-pkgconfig.diff
+
 * Sat Oct 20 2007 Ralf Corsépius <rc040203 at freenet.de> - 1.2.0-12
 - Change Source: to using downloads.sourceforge.net.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lib3ds/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Jan 2006 14:07:47 -0000	1.3
+++ sources	3 Nov 2007 07:34:31 -0000	1.4
@@ -1,2 +1 @@
-3a7f891d18af0151876b98bc05d3b373  lib3ds-1.2.0.tar.gz
-f337a875d264c2e938d762ca82491451  lib3ds-cvs-20060105.diff
+2572f7b0f29b591d494c1a0658b35c86  lib3ds-1.3.0.zip