From: <mo...@us...> - 2008-01-26 12:43:10
|
Revision: 837 http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=837&view=rev Author: moinakg Date: 2008-01-26 04:43:10 -0800 (Sat, 26 Jan 2008) Log Message: ----------- ext-sources/buildkde: Various typo and other fixes. Re-order some specs. encumbered/SFExine-lib.spec: Change SFEgcc deps, follows from SFEgcc refactoring. SFEneon.spec: Fixed typo in conflict tag. SFEkdetoys3.spec: Add KDE fun apps package. SFEgcc.spec: Refactor package to have SFEgcc and SFEgccruntime. Modified Paths: -------------- spec-files-extra/trunk/ChangeLog spec-files-extra/trunk/SFEgcc.spec spec-files-extra/trunk/SFEneon.spec spec-files-extra/trunk/encumbered/SFExine-lib.spec spec-files-extra/trunk/ext-sources/buildkde Added Paths: ----------- spec-files-extra/trunk/SFEkdetoys3.spec Modified: spec-files-extra/trunk/ChangeLog =================================================================== --- spec-files-extra/trunk/ChangeLog 2008-01-26 09:08:44 UTC (rev 836) +++ spec-files-extra/trunk/ChangeLog 2008-01-26 12:43:10 UTC (rev 837) @@ -1,3 +1,16 @@ +2008-01-26 Moinak Ghosh <moi...@su...> + * ext-sources/buildkde: + Various typo and other fixes. + Re-order some specs. + * encumbered/SFExine-lib.spec: + Change SFEgcc deps, follows from SFEgcc refactoring. + * SFEneon.spec: + Fixed typo in conflict tag. + * SFEkdetoys3.spec: + Add KDE fun apps package. + * SFEgcc.spec: + Refactor package to have SFEgcc and SFEgccruntime. + 2008-01-26 Brian Cameron <bri...@su...> * SFEconsolekit.spec: Modified: spec-files-extra/trunk/SFEgcc.spec =================================================================== --- spec-files-extra/trunk/SFEgcc.spec 2008-01-26 09:08:44 UTC (rev 836) +++ spec-files-extra/trunk/SFEgcc.spec 2008-01-26 12:43:10 UTC (rev 837) @@ -7,8 +7,8 @@ %include usr-gnu.inc %include base.inc -Name: SFEgcc -Summary: GNU gcc +Name: SFEgccruntime +Summary: GNU gcc runtime libraries required by applications Version: 4.2.2 Source: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-%{version}/gcc-%{version}.tar.bz2 Patch1: gcc-01-bug-32787.diff @@ -23,14 +23,23 @@ Requires: SFEgmp Requires: SUNWpostrun -%package devel -Summary: %{summary} - developer files +%package -n SFEgcc +Summary: GNU gcc +Version: 4.2.2 SUNW_BaseDir: %{_basedir} %include default-depend.inc Requires: %name +BuildRequires: SFEgmp-devel +BuildRequires: SFEbinutils +Requires: SFEbinutils +BuildRequires: SFEmpfr-devel +Requires: SFEmpfr +Requires: SFEgmp +Requires: SUNWpostrun + %if %build_l10n -%package l10n +%package -n SFEgcc-l10n Summary: %{summary} - l10n files SUNW_BaseDir: %{_basedir} %include default-depend.inc @@ -38,7 +47,7 @@ %endif %prep -%setup -q -c -n %name-%version +%setup -q -c -n %{name}-%version mkdir gcc cd gcc-%{version} %patch1 -p1 -b .patch01 @@ -119,15 +128,10 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/locale %endif -rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a -rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/%{_arch64}/lib*.a -rm -f $RPM_BUILD_ROOT%{_libdir}/%{_arch64}/lib*.la - %clean rm -rf $RPM_BUILD_ROOT -%post +%post -n SFEgcc ( echo 'PATH=/usr/bin:/usr/sfw/bin; export PATH' ; echo 'infos="'; echo 'gcc.info cpp.info gccint.info cppinternals.info gccinstall.info gfortran.info' ; @@ -138,7 +142,7 @@ echo 'done'; echo 'exit $retval' ) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -c SFE -%preun +%preun -n SFEgcc ( echo 'PATH=/usr/bin:/usr/sfw/bin; export PATH' ; echo 'infos="'; echo 'gcc.info cpp.info gccint.info cppinternals.info gccinstall.info gfortran.info' ; @@ -149,14 +153,26 @@ echo 'exit 0' ) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -c SFE %files +%dir %attr (0755, root, bin) %{_prefix} +%dir %attr (0755, root, bin) %{_libdir} +%{_libdir}/lib*.so* +%{_libdir}/lib*.spec +%ifarch amd64 sparcv9 +%dir %attr (0755, root, bin) %{_libdir}/%{_arch64} +%{_libdir}/%{_arch64}/lib*.so* +%{_libdir}/%{_arch64}/lib*.spec +%endif + + +%files -n SFEgcc %defattr (-, root, bin) %dir %attr (0755, root, bin) %{_prefix} %{_prefix}/man %dir %attr (0755, root, bin) %{_bindir} %{_bindir}/* %dir %attr (0755, root, bin) %{_libdir} -%{_libdir}/lib*.so* -%{_libdir}/lib*.spec +%{_libdir}/lib*.a +%{_libdir}/lib*.la %{_libdir}/gcc %dir %attr (0755, root, sys) %{_datadir} %dir %attr (0755, root, bin) %{_mandir} @@ -169,22 +185,23 @@ %{_infodir}/* %ifarch amd64 sparcv9 %dir %attr (0755, root, bin) %{_libdir}/%{_arch64} -%{_libdir}/%{_arch64}/lib*.so* -%{_libdir}/%{_arch64}/lib*.spec +%{_libdir}/%{_arch64}/lib*.a +%{_libdir}/%{_arch64}/lib*.la %endif - -%files devel %defattr (-, root, bin) %{_includedir} %if %build_l10n -%files l10n +%files -n SFEgcc-l10n %defattr (-, root, bin) +%dir %attr (0755, root, bin) %{_prefix} %dir %attr (0755, root, sys) %{_datadir} %attr (-, root, other) %{_datadir}/locale %endif %changelog +* Sat Jan 26 2008 - Moinak Ghosh <moi...@su...> +- Refactor package to have SFEgcc and SFEgccruntime. * Sun Oct 14 2007 - Mark Wright <mar...@in...> - Bump to 4.2.2. * Wed Aug 15 2007 - Mark Wright <mar...@in...> @@ -201,4 +218,5 @@ * Sun Mar 7 2007 - Doug Scott <do...@tr...> - change to use GNU as from SFEbinutils * Sun Mar 7 2007 - Doug Scott <do...@tr...> +M - Initial spec Added: spec-files-extra/trunk/SFEkdetoys3.spec =================================================================== --- spec-files-extra/trunk/SFEkdetoys3.spec (rev 0) +++ spec-files-extra/trunk/SFEkdetoys3.spec 2008-01-26 12:43:10 UTC (rev 837) @@ -0,0 +1,116 @@ +# +# Copyright (c) 2008 Sun Microsystems, Inc. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. + +%include Solaris.inc + +%define kde_version 3.5.8 + +Name: SFEkdetoys3 +Summary: Assorted fun programs from Official KDE +Version: %{kde_version} +Source: http://mirrors.isc.org/pub/kde/stable/%{kde_version}/src/kdetoys-%{version}.tar.bz2 + +SUNW_BaseDir: %{_basedir} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%include default-depend.inc +%include perl-depend.inc + +# This also brings in all relevant deps including kdelibs, qt, aRts and others. +Requires: SFEkdebase3 +BuildRequires: SFEkdebase3-devel +Requires: SUNWlibusb +Requires: SFEarts +BuildRequires: SFEarts-devel + +%package devel +Summary: %{summary} - development files +SUNW_BaseDir: %{_basedir} +%include default-depend.inc +Requires: %name +Requires: SFEkdebase3-devel +Requires: SFEarts-devel + +%prep +%setup -q -n kdetoys-%version + +if [ "x`basename $CC`" != xgcc ] +then + %error This spec file requires Gcc, set the CC and CXX env variables +fi + +%build +CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '` +if test "x$CPUS" = "x" -o $CPUS = 0; then + CPUS=1 +fi + +export CFLAGS="%optflags -fPIC -I%{xorg_inc} -I%{gnu_inc} -I%{sfw_inc} `/usr/bin/libart2-config --cflags` -D__C99FEATURES__ -D__EXTENSIONS__" + +export CXXFLAGS="%cxx_optflags -I%{xorg_inc} -I%{gnu_inc} -I%{sfw_inc} `/usr/bin/libart2-config --cflags` -D__C99FEATURES__ -D__EXTENSIONS__" + +export LDFLAGS="%_ldflags %{xorg_lib_path} %{gnu_lib_path} %{sfw_lib_path} -lc -lsocket -lnsl `/usr/bin/libart2-config --libs`" + +export LIBS=$LDFLAGS + +export PATH="${PATH}:/usr/openwin/bin" +extra_inc="%{xorg_inc}:%{gnu_inc}:%{sfw_inc}" +sfw_prefix=`dirname %{sfw_bin}` + +./configure --prefix=%{_prefix} \ + --sysconfdir=%{_sysconfdir} \ + --enable-shared=yes \ + --enable-static=no \ + --enable-final \ + --with-extra-includes="${extra_inc}" \ + --with-pic + + +make -j$CPUS + +%install +rm -rf $RPM_BUILD_ROOT + +make install DESTDIR=$RPM_BUILD_ROOT + +# KDE requires the .la files + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr (-, root, bin) +%dir %attr (0755, root, bin) %{_bindir} +%{_bindir}/* +%dir %attr (0755, root, bin) %{_libdir} +%{_libdir}/lib*.so* +%{_libdir}/lib*.la* +%dir %attr (0755, root, other) %{_libdir}/kde3 +%{_libdir}/kde3/* + +%defattr (-, root, other) +%dir %attr (0755, root, sys) %{_datadir} +%dir %attr (0755, root, other) %{_datadir}/icons +%{_datadir}/icons/* +%dir %attr (0755, root, other) %{_datadir}/applications +%{_datadir}/applications/* +%dir %attr (0755, root, other) %{_datadir}/apps +%{_datadir}/apps/* +%dir %attr (0755, root, other) %{_datadir}/applnk +%{_datadir}/applnk/* +%dir %attr (0755, root, other) %{_datadir}/services +%{_datadir}/services/* + +%defattr (-, root, bin) +%dir %attr (0755, root, other) %{_datadir}/doc +%{_datadir}/doc/* + +%files devel +%defattr (-, root, bin) +%dir %attr (0755, root, bin) %{_includedir} +%{_includedir}/* + +%changelog +* Sat Jan 26 2008 - moi...@su... +- Initial spec. Modified: spec-files-extra/trunk/SFEneon.spec =================================================================== --- spec-files-extra/trunk/SFEneon.spec 2008-01-26 09:08:44 UTC (rev 836) +++ spec-files-extra/trunk/SFEneon.spec 2008-01-26 12:43:10 UTC (rev 837) @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build SUNW_BaseDir: %{_prefix} %include default-depend.inc -Conflict: SUNWneon +Conflicts: SUNWneon Requires: SUNWlibms Requires: SUNWzlib Requires: SUNWlexpt @@ -117,6 +117,8 @@ %endif %changelog +* Sat Jan 26 2008 - moi...@su... +- Fixed typo in conflict tag. * Sat Jan 13 2008 - moi...@su... - Add conflict with SUNWneon * Wed Mar 28 2007 - la...@su... Modified: spec-files-extra/trunk/encumbered/SFExine-lib.spec =================================================================== --- spec-files-extra/trunk/encumbered/SFExine-lib.spec 2008-01-26 09:08:44 UTC (rev 836) +++ spec-files-extra/trunk/encumbered/SFExine-lib.spec 2008-01-26 12:43:10 UTC (rev 837) @@ -55,8 +55,8 @@ BuildRequires: SUNWgcc Requires: SUNWgccruntime %else -BuildRequires: SFEgcc-devel -Requires: SFEgcc +BuildRequires: SFEgcc +Requires: SFEgccruntime %endif %if %with_hal @@ -314,6 +314,8 @@ %changelog * Sat Jan 26 2008 - moi...@su... +- Change SFEgcc deps, follows from SFEgcc refactoring. +* Sat Jan 26 2008 - moi...@su... - Refactor package into encumbered and non-encumbered parts. - Use gmake instead of Solaris make. - Allow optional build using Gcc3. Modified: spec-files-extra/trunk/ext-sources/buildkde =================================================================== --- spec-files-extra/trunk/ext-sources/buildkde 2008-01-26 09:08:44 UTC (rev 836) +++ spec-files-extra/trunk/ext-sources/buildkde 2008-01-26 12:43:10 UTC (rev 837) @@ -33,6 +33,10 @@ # Changelog # # 2008-01-26 - Moinak Ghosh <moi...@su...> +# Various typo and other fixes. +# Re-order some specs. +# +# 2008-01-26 - Moinak Ghosh <moi...@su...> # Add remaining spec files for KDE3 dependencies and a few additional stuff. # TODO: Need review. # @@ -84,7 +88,10 @@ fi } +if [ 0 -eq 1 ] +then if [ `pkginfo -q SUNWgnu-libiconv` ] +then if [ `pkginfo -q SFEgettext` ] then call_pkgtool $_GCC "SFEgettext.spec:SFElibiconv.spec" @@ -112,25 +119,33 @@ call_pkgtool $_GCC "SFEwxwidgets-gnu.spec" call_pkgtool $_STUDIO "SFEfreetype.spec:SFEjam.spec:SFEfreeglut.spec:SFElibgsm.spec" call_pkgtool $_GCC "SFEnasm.spec:SFElibx264.spec" -call_pkgtool $_STUDIO "SFEid3lib.spec:SFEamrwb.spec:SFEncurses.spec:SFEneon.spec:SFEswig.spec:SFElcms.spec:SFElibmng.spec:encumbered/SFElibnjb.spec:SFElibao.spec:SFEliveMedia.spec:SFElibcdio.spec:SFElibfribidi.spec:SFEladspa.spec:SFEopenal.spec:SFEgawk.spec:SFEsdl-image.spec:SFElibebml.spec:SFElibmatroska.spec:SFElibcddb.spec:SFElibupnp.spec:SFEvcdimager.spec:SFElibtar.spec:SFEcurl.spec:SFElibdiscid.spec:SFEruby.spec:SFEjack.spec:SFEfftw.spec" +call_pkgtool $_STUDIO "SFEid3lib.spec:SFEamrwb.spec:SFEncurses.spec" +if [ `pkginfo -q SUNWneon` ] +then + call_pkgtool $_STUDIO SFEneon.spec +fi + +call_pkgtool $_STUDIO "SFEswig.spec:SFElcms.spec:SFElibmng.spec:encumbered/SFElibnjb.spec:SFElibao.spec:SFEliveMedia.spec:SFElibcdio.spec:SFElibfribidi.spec:SFEladspa.spec:SFEopenal.spec:SFEgawk.spec:SFEsdl-image.spec:SFElibebml.spec:SFElibmatroska.spec:SFElibcddb.spec:SFElibupnp.spec:SFEvcdimager.spec:SFElibtar.spec:SFEcurl.spec:SFElibdiscid.spec:SFEruby.spec:SFEjack.spec:SFEfftw.spec" + # Build encumbered stuff # TODO: Need a mechanism to make this optional. Needs modifications to KDE spec files as well. -call_pkgtool $_STUDIO "encumbered/SFEamrnb:encumbered/SFEdvdauthor:encumbered/SFEfaad2" -call_pkgtool $_STUDIO "encumbered/SFEffmpeg:encumbered/SFElame" -call_pkgtool $_STUDIO "encumbered/SFEliba52:encumbered/SFElibdts:encumbered/SFElibdv" -call_pkgtool $_STUDIO "encumbered/SFElibdvbpsi:encumbered/SFElibdvdcss:encumbered/SFElibdvdnav" -call_pkgtool $_STUDIO "encumbered/SFElibdvdplay:encumbered/SFElibdvdread:encumbered/SFElibfame" -call_pkgtool $_STUDIO "encumbered/SFElibid3tag-gnu:encumbered/SFElibid3tag:encumbered/encumbered/SFElibmad" -call_pkgtool $_STUDIO "encumbered/SFElibmpcdec:encumbered/SFElibmpeg2:encumbered/SFElibnjb" -call_pkgtool $_STUDIO "encumbered/SFElibquicktime:encumbered/SFEmpg321:encumbered/SFEmpgtx" -call_pkgtool $_STUDIO "encumbered/SFEmplayer-codecs:encumbered/SFEmplayer-plugin:encumbered/SFEmplayer" -call_pkgtool $_STUDIO "encumbered/SFEogle:encumbered/SFEswfdec:encumbered/SFEtwolame:encumbered/SFEvlc" -call_pkgtool $_STUDIO "encumbered/SFEvnc2swf:encumbered/SFExmms2" -call_pkgtool $_GCC "encumbered/SFExvid" +call_pkgtool $_STUDIO "encumbered/SFElibdvdcss.spec:encumbered/SFElibdvdread.spec" +call_pkgtool $_STUDIO "encumbered/SFEdvdauthor.spec:encumbered/SFEfaad2.spec" +call_pkgtool $_STUDIO "encumbered/SFEliba52.spec:encumbered/SFElibdts.spec" +call_pkgtool $_GCC "encumbered/SFExvid.spec" +call_pkgtool $_STUDIO "encumbered/SFElame.spec" +call_pkgtool $_STUDIO "encumbered/SFEffmpeg.spec:encumbered/SFElibdv.spec:encumbered/SFElibdvbpsi.spec" +call_pkgtool $_STUDIO "encumbered/SFElibdvdnav.spec:encumbered/SFElibdvdplay.spec:encumbered/SFElibfame.spec" +call_pkgtool $_STUDIO "encumbered/SFElibid3tag-gnu.spec:encumbered/SFElibid3tag.spec:encumbered/SFElibmad.spec" +call_pkgtool $_STUDIO "encumbered/SFElibmpcdec.spec:encumbered/SFElibmpeg2.spec:encumbered/SFElibnjb.spec" +call_pkgtool $_STUDIO "encumbered/SFElibquicktime.spec:encumbered/SFEmpg321.spec:encumbered/SFEmpgtx.spec" +call_pkgtool $_STUDIO "encumbered/SFEmplayer-codecs.spec:encumbered/SFEtwolame.spec:encumbered/SFEmplayer.spec" +call_pkgtool $_STUDIO "encumbered/SFEmplayer-plugin.spec:encumbered/SFEogle.spec:encumbered/SFEswfdec.spec:encumbered/SFEvlc.spec" +call_pkgtool $_STUDIO "encumbered/SFEvnc2swf.spec:encumbered/SFExmms2.spec" _OPATH=$PATH -PATH="/usr/ucb:${PATH} +PATH="/usr/ucb:${PATH}" export PATH call_pkgtool $_STUDIO "encumbered/SFEgpac.spec" PATH=$_OPATH @@ -228,8 +243,9 @@ _USE_GCC3_="1" export _USE_GCC3_ -call_pkgtool $_GCC "encumbered/SFExine-lib-gcc3.spec" +call_pkgtool $_GCC "encumbered/SFExine-lib.spec" unset _USE_GCC3_ +fi -call_pkgtool $_GCC "SFEamarok1.spec:SFEkdeedu3.spec" +call_pkgtool $_GCC "SFEamarok1.spec:SFEkdeedu3.spec:SFEkdetoys3.spec" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |