- added gcc33 and opt patches, some cleanups

Changed files:
    3dwm.spec -> 1.7

diff --git a/3dwm.spec b/3dwm.spec
index 49b1d11297d8ec63220c2c9cb70de206bc6263da..328c4577c4fabd7ff1712365671c650481d99290 100644 (file)
--- a/3dwm.spec
+++ b/3dwm.spec
@@ -3,8 +3,8 @@ Summary(pl):    Tr
 Name:          3dwm
 Version:       0.3.2
 Release:       0.1
-Group:         X11/Window Managers
 License:       LGPL
+Group:         X11/Window Managers
 Source0:       http://www.3dwm.org/download/%{name}-%{version}.tar.gz
 # Source0-md5: 61510b9e9769a36e5790c9d606bfbfbb
 Source1:       %{name}-tdwmrc
@@ -12,6 +12,8 @@ Patch0:               %{name}-autocrap.patch
 Patch1:                %{name}-gcc32.patch
 Patch2:                %{name}-SDL-in-usr-X11R6.patch
 Patch3:                %{name}-omniORB4.patch
+Patch4:                %{name}-gcc33.patch
+Patch5:                %{name}-opt.patch
 URL:           http://www.3dwm.org/
 BuildRequires: OpenGL-devel
 BuildRequires: SDL-devel
@@ -24,6 +26,8 @@ BuildRequires:        libpng-devel
 BuildRequires: libtool
 BuildRequires: meshio-devel
 BuildRequires: omniORB-devel
+# omniidl is here
+BuildRequires: omniORB
 Requires:      %{name}-libs = %{version}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -138,6 +142,8 @@ czcionek True Type 3D, og
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 rm -f config/missing config/macros/ac_help_string.m4
@@ -159,7 +165,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm $RPM_BUILD_ROOT%{_datadir}/3Dwm/tdwmrc
+rm -f $RPM_BUILD_ROOT%{_datadir}/3Dwm/tdwmrc
 install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/3Dwm/tdwrc
 
 %clean
@@ -176,14 +182,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/*.so.*
+%attr(755,root,root) %{_libdir}/lib*.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/*.so
-%{_libdir}/*.la
+%attr(755,root,root) %{_libdir}/lib*.so
+%{_libdir}/lib*.la
 %{_includedir}/Nobel*
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/*.a
+%{_libdir}/lib*.a