rpms/lib3ds/EL-6 lib3ds.spec, 1.23, 1.24 lib3ds-1.3.0-3ds2m.diff, 1.1, NONE

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/lib3ds/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27864

Modified Files:
	lib3ds.spec 
Removed Files:
	lib3ds-1.3.0-3ds2m.diff 
Log Message:
* Tue May 11 2010 Dan Horák <dan[at]danny.cz> - 1.3.0-8
- cleanup for import into EPEL



Index: lib3ds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lib3ds/EL-6/lib3ds.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- lib3ds.spec	25 Jul 2009 05:06:07 -0000	1.23
+++ lib3ds.spec	11 May 2010 09:40:50 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           lib3ds
 Version:        1.3.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 
 Summary:        3D Studio file format library
 
@@ -9,7 +9,6 @@ License:        LGPLv2+
 URL:            http://lib3ds.sourceforge.net
 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)
 
@@ -37,10 +36,6 @@ Some tools to process 3ds files.
 %doc AUTHORS COPYING ChangeLog README
 %{_bindir}/3dsdump
 %{_mandir}/man1/3dsdump.1*
-%if 0%{?fedora} < 9
-%{_bindir}/3ds2m
-%{_mandir}/man1/3ds2m.1*
-%endif
 
 %package        devel
 Summary:        %summary
@@ -51,29 +46,14 @@ Requires:	lib3ds = %{version}-%{release}
 %description    devel
 Development files for lib3ds
 
-%if 0%{?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
 %patch2 -p1
 
-%if 0%{?fedora} < 9
-%patch3 -p1
-%endif
 
 %build
-%configure \
-%if 0%{?fedora} >= 9
-  --disable-static
-%endif
+%configure  --disable-static
 
 make %{?_smp_mflags}
 
@@ -107,11 +87,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun -p /sbin/ldconfig
 
-%if 0%{?fedora} < 9
-%files static
-%{_libdir}/*.a
-%endif
-
 
 %files devel
 %defattr(-,root,root,-)
@@ -123,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*
 
 %changelog
+* Tue May 11 2010 Dan Horák <dan[at]danny.cz> - 1.3.0-8
+- cleanup for import into EPEL
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- lib3ds-1.3.0-3ds2m.diff DELETED ---