Index: parrot.spec
===================================================================
--- parrot.spec	(revision 37063)
+++ parrot.spec	(working copy)
@@ -11,13 +11,13 @@
 BuildRequires:  ncurses-devel
 BuildRequires:  gmp-devel
 BuildRequires:  gdbm-devel
-BuildRequires:  /usr/bin/perldoc
 BuildRequires:  libicu-devel
 
-%package languages
+%package docs
 Summary:        Parrot Virtual Machine languages
 License:        Artistic 2.0
 Group:          Development/Libraries
+BuildRequires:  /usr/bin/perldoc
 
 %package devel
 Summary:        Parrot Virtual Machine development headers and libraries
@@ -31,8 +31,9 @@
 bytecode for dynamic languages. Parrot is the target for Rakudo Perl 6,
 as well as variety of other languages.
 
-%description languages
-High-level languages which run on the Parrot virtual machine.
+%description docs
+Documentation in text-, POD- and HTML-format (docs/html-subdirectory) and also
+examples about the Parrot Virtual Machine
 
 %description devel
 Parrot Virtual Machine development headers and libraries.
@@ -47,6 +48,15 @@
     tools/dev/mk_manifests.pl
 
 %build
+if test "%{_vendor}" = "suse"
+then
+    LIBS='-lncurses -lm'
+else
+    LIBS='-lcurses -lm'
+fi
+%ifarch x86_64
+	RPM_OPT_FLAGS=`echo "$RPM_OPT_FLAGS" | %{__perl} -pi -e 's/-O2//'`
+%endif
 %{__perl} Configure.pl \
     --prefix=%{_usr} \
     --libdir=%{_libdir} \
@@ -59,12 +69,11 @@
     --parrot_is_shared \
     --lex=/usr/bin/flex \
     --yacc=/usr/bin/yacc \
-    --libs='-lcurses -lm'
+    --libs="$LIBS"
 
 export LD_LIBRARY_PATH=$( pwd )/blib/lib
 make
-make languages
-make perl6
+make compilers
 make parrot_utils
 make installable
 make html
@@ -76,7 +85,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # Drop the docs so rpm can pick them up itself.
-rm -rf $RPM_BUILD_ROOT/%{_docdir}/parrot
+rm -rf $RPM_BUILD_ROOT%{_usr}/share/doc/parrot    # necessary for SuSE
+#rm -rf $RPM_BUILD_ROOT/%{_docdir}/parrot         # for Solaris?
 
 # Force permissions on doc directories.
 find docs examples -type d -exec chmod 755 {} \;
@@ -108,23 +118,18 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog CREDITS NEWS PBC_COMPAT PLATFORMS README
-%doc RESPONSIBLE_PARTIES TODO
-%doc docs examples
 %exclude %{_bindir}/parrot_config
-%exclude %{_bindir}/perl6
 %exclude %{_bindir}/parrot_debugger
 %exclude %{_bindir}/pbc_*
 %{_bindir}/*
 %{_libdir}/parrot
 %{_libdir}/libparrot.so.*
-%{_usr}/compilers
 
-%files languages
+%files docs
 %defattr(-,root,root,-)
-%{_bindir}/perl6
-%{_usr}/languages
-%{_usr}/runtime
+%doc ChangeLog CREDITS NEWS PBC_COMPAT PLATFORMS README
+%doc RESPONSIBLE_PARTIES TODO
+%doc docs examples
 
 %files devel
 %defattr(-,root,root,-)