Index: parrot/parrot.spec =================================================================== --- parrot/parrot.spec (revision 37327) +++ parrot/parrot.spec (working copy) @@ -11,13 +11,22 @@ BuildRequires: ncurses-devel BuildRequires: gmp-devel BuildRequires: gdbm-devel -BuildRequires: /usr/bin/perldoc BuildRequires: libicu-devel +Provides: perl(Parrot::Pmc2c::PCCMETHOD_BITS) +Provides: perl(Parrot::Pmc2c::MethodEmitter) +Provides: perl(Parrot::Pmc2c::PMCEmitter) -%package languages -Summary: Parrot Virtual Machine languages +%define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0) +%if %is_suse +%define _docdir %{_usr}/share/doc +%endif +%define parrotlib %{_libdir}/parrot/%{version}-devel/ + +%package docs +Summary: Parrot Virtual Machine documentation License: Artistic 2.0 Group: Development/Libraries +BuildRequires: /usr/bin/perldoc %package devel Summary: Parrot Virtual Machine development headers and libraries @@ -31,8 +40,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 +57,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 +78,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 @@ -73,7 +91,7 @@ rm -rf $RPM_BUILD_ROOT export LD_LIBRARY_PATH=$( pwd )/blib/lib -make install DESTDIR=$RPM_BUILD_ROOT +make install-dev DESTDIR=$RPM_BUILD_ROOT # Drop the docs so rpm can pick them up itself. rm -rf $RPM_BUILD_ROOT/%{_docdir}/parrot @@ -88,9 +106,10 @@ # These files *probably* aren't needed. rm -rf $RPM_BUILD_ROOT%{_usr}/config \ - $RPM_BUILD_ROOT%{_includedir}/src \ - $RPM_BUILD_ROOT%{_usr}/src \ - $RPM_BUILD_ROOT%{_usr}/tools + $RPM_BUILD_ROOT%{_includedir}/src +# Don't add the following to the list of unneeded above, as they're needed to build rakudo +# $RPM_BUILD_ROOT%{_usr}/src +# $RPM_BUILD_ROOT%{_usr}/tools %check export LD_LIBRARY_PATH=$( pwd )/blib/lib @@ -108,23 +127,21 @@ %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}/* + +%exclude %{parrotlib}/languages %{_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,-) @@ -139,8 +156,19 @@ %{_libdir}/libparrot.so %{_libdir}/libparrot.a %{_libdir}/pkgconfig/* +%{parrotlib}/languages +%{_usrsrc}/%{name}/%{version}-devel/ %changelog +* Wed Mar 11 2009 Tim Nelson 0.9.1 +- Added some things that we provide, but that don't get picked up automatically by RPM +- Added some development tools to the -devel package that are used in the Rakudo build process + +* Fri Feb 13 2009 Gerd Pokorra 0.9.0 +- Removed the languages package, as we no longer intend to provide that +- Added the docs package +- Modified to work with SuSE + * Tue Jan 23 2009 Reini Urban 0.9.0 - added make installable, perl6 is still not installable - added parrot_utils to devel