- pl description, cleanups, missing dirs, removed Ra-specific prefix

Changed files:
    OpenSceneGraph.spec -> 1.4

diff --git a/OpenSceneGraph.spec b/OpenSceneGraph.spec
index bddf8a7ebcdd123e633420828888d9990d32dd83..d2092735dd800423f62af4e360f905b1b927f716 100644 (file)
--- a/OpenSceneGraph.spec
+++ b/OpenSceneGraph.spec
@@ -3,100 +3,102 @@ Summary(pl):        Open Scene Graph - biblioteka do wizualizacji
 Name:          OpenSceneGraph
 Version:       0.9.3
 Release:       1
-Copyright:     LGPL
-Group:         X11/Graphics
+License:       LGPL
+Group:         X11/Libraries
 Source0:       http://openscenegraph.org/download/snapshots/%{name}-%{version}.tar.gz
 Source1:       http://openscenegraph.org/download/dox/osg-doxygen-0.9.1.tar.gz
 URL:           http://openscenegraph.org/
-BuildRequires: libtiff-devel
 BuildRequires: freetype-devel
 BuildRequires: freetype1-devel
+BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
+BuildRequires: libtiff-devel
 BuildRequires: libungif-devel
-BuildRequires: libjpeg-devel
 BuildRequires: zlib-devel
-#BuildRequires:        libtiff-devel
-#BuildRequires:        libtiff-devel
-#BuildRequires:        libtiff-devel
-#Requires:     
-#Patch0:               osg-Makefile.patch
 Buildroot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define        _prefix /usr/X11R6
-
 %description
-The Open Scene Graph is a cross-plathorm C++/OpenGL library for 
+The Open Scene Graph is a cross-platform C++/OpenGL library for 
 the real-time visualization.
 
 %description -l pl
+Open Scene Graph to wieloplatformowa oparta o C++ i OpenGL biblioteka
+do wizualizacji w czasie rzeczywistym.
 
 %package devel
-Summary:       Header files of Open Scene Graph 
+Summary:       Header files for Open Scene Graph 
 Summary(pl):   Pliki nag³ówkowe dla Open Scene Graph
-Group:         Development/Library
+Group:         Development/Libraries
 Requires:      %{name} = %{version}
+
 %description devel 
 Headers file for OSD library.
+
 %description devel -l pl
-Pliki nag³ówkowe dla biblioteki Open Scene Graph
+Pliki nag³ówkowe dla biblioteki Open Scene Graph.
 
 %package examples
 Summary:       Examples for Open Scene Graph 
 Summary(pl):   Przyk³ady dla Open Scene Graph
-Group:         Development/Library
+Group:         Development/Libraries
 Requires:      %{name} = %{version}
+
 %description examples
-Examples for Open Scene Graph Library
-%description examples -l pl
-Przyk³ady dla biblioteki Open Scene Graph
+Examples for Open Scene Graph Library.
 
-%package plugin
-Summary:       Plug-Ins for Open Scene Graph 
-Summary(pl):   Pluginy dla Open Scene Graph
-Group:         Development/Library
-Requires:      %{name} = %{version}
-%description plugin
-Plugins for OSD library.
-%description plugin -l pl
-Pluginy dla biblioteki Open Scene Graph
+%description examples -l pl
+Przyk³ady dla biblioteki Open Scene Graph.
+
+# no such package (yet?)
+#%package plugin
+#Summary:      Plugins for Open Scene Graph 
+#Summary(pl):  Wtyczki dla biblioteki Open Scene Graph
+#Group:                Libraries
+#Requires:     %{name} = %{version}
+#
+#%description plugin
+#Plugins for Open Scene Graph library.
+#
+#%description plugin -l pl
+#Wtyczki dla biblioteki Open Scene Graph.
 
 %prep
 %setup -q
 
-#%patch0 -p1
-
 %build
-%{__make} CC=gcc CXX=g++ INC="-I/usr/X11R6/include -I/usr/include -I/usr/include/freetype2"
+%{__make} \
+       CC="%{__cc}" \
+       CXX="%{__cxx}" \
+       INC="-I/usr/X11R6/include -I/usr/include/freetype2"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} \
        INST_SYS_PREFIX=$RPM_BUILD_ROOT%{_prefix} \
        INST_SHARE_PREFIX=$RPM_BUILD_ROOT%{_datadir} \
-       INST_SRC=$RPM_BUILD_ROOT/usr/src/examples/%{name} \
-       INST_DEMOS=$RPM_BUILD_ROOT/usr/src/examples/%{name} \
+       INST_SRC=$RPM_BUILD_ROOT%{_examplesdir}/%{name} \
+       INST_DEMOS=$RPM_BUILD_ROOT%{_examplesdir}/%{name} \
        install
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post  -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
 %files
-%defattr(644, root, root, 755)
-%doc
-%attr(755, root, root) %{_libdir}/*.so
-%attr(755, root, root) %{_libdir}/osgPlugins/*
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/*.so
+%dir %{_libdir}/osgPlugins
+%attr(755,root,root) %{_libdir}/osgPlugins/*
 
 %files devel
-%defattr(644, root, root, 755)
-%attr(644, root, root) %{_includedir}/osg*/*
+%defattr(644,root,root,755)
+%attr(644,root,root) %{_includedir}/osg*
 
 %files examples
-%defattr(644, root, root, 755)
-%attr(644, root, root) /usr/src/examples/%{name}/Make/*
-%attr(644, root, root) /usr/src/examples/%{name}/demos/*/*
-%attr(755, root, root) /usr/src/examples/%{name}/osg*
-
-%files plugin
+%defattr(644,root,root,755)
+%dir %{_examplesdir}/%{name}
+%{_examplesdir}/%{name}/Make
+%{_examplesdir}/%{name}/demos
+%attr(755,root,root) %{_examplesdir}/%{name}/osg*