r41827 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r41826‎ | r41827 | r41828 >
Date:01:58, 8 October 2008
Author:river
Status:old
Tags:
Comment:
TSpkgbuild: new spec
TSlibmcrypt: new spec
TSphp: build with mcrypt
Modified paths:
  • /trunk/tools/ts-specs/TSlibmcrypt.spec (added) (history)
  • /trunk/tools/ts-specs/TSphp.spec (modified) (history)
  • /trunk/tools/ts-specs/TSpkgbuild.spec (added) (history)
  • /trunk/tools/ts-specs/base-specs/libmcrypt.spec (added) (history)
  • /trunk/tools/ts-specs/patches/pkgbuild-01-notify-send.diff (added) (history)

Diff [purge]

Index: trunk/tools/ts-specs/base-specs/libmcrypt.spec
——@@ -0,0 +1,40 @@
 2+#
 3+# spec file for package TSlibmcrypt
 4+#
 5+# includes module(s): libmcrypt
 6+#
 7+Name: TSlibmcrypt
 8+Summary: mcrypt - replacement for the old crypt() package and crypt(1) command
 9+Version: 2.5.8
 10+URL: http://mcrypt.sourceforge.net/
 11+Source: http://ovh.dl.sourceforge.net/sourceforge/mcrypt/libmcrypt-2.5.8.tar.gz
 12+SUNW_BaseDir: %{_basedir}
 13+BuildRoot: %{_tmppath}/%{name}-%{version}-build
 14+
 15+%include default-depend.inc
 16+
 17+%prep
 18+rm -rf %name-%version
 19+%setup -q -n libmcrypt-%version
 20+
 21+%build
 22+
 23+./configure --prefix=%{_prefix} \
 24+ --bindir=%{_bindir} \
 25+ --includedir=%{_includedir} \
 26+ --mandir=%{_mandir} \
 27+ --libdir=%{_libdir} \
 28+ --enable-rpath \
 29+ %{?configure_options}
 30+
 31+dmake -j$CPUS all
 32+
 33+%install
 34+make DESTDIR=${RPM_BUILD_ROOT} install
 35+
 36+%clean
 37+rm -rf $RPM_BUILD_ROOT
 38+
 39+%changelog
 40+* Sun Oct 5 2008 - river@wikimedia.org
 41+- initial release
Index: trunk/tools/ts-specs/TSphp.spec
——@@ -60,7 +60,8 @@
6161 --with-bz2 \
6262 --enable-exif \
6363 --enable-ftp \
64 - --with-mysqli=/opt/mysql/bin/mysql_config
 64+ --with-mysqli=/opt/mysql/bin/mysql_config \
 65+ --with-mcrypt=/opt/ts
6566
6667
6768 gmake -j$CPUS
——@@ -95,6 +96,8 @@
9697 /etc/opt/php/pear.conf
9798
9899 %changelog
 100+* Sun Oct 5 2008 - river@wikimedia.org
 101+- add build option: --with-mcrypt
99102 * Thu Oct 2 2008 - river@wikimedia.org
100103 - add build options: --with-zlib --with-bz2 --enable-exif --enable-ftp --with-mysqli
101104 * Sun Jul 6 2008 - river@wikimedia.org
Index: trunk/tools/ts-specs/patches/pkgbuild-01-notify-send.diff
——@@ -0,0 +1,20 @@
 2+--- pkgtool.pl.orig Sun Oct 5 18:45:40 2008
 3+@@ -131,7 +131,7 @@
 4+ 1);
 5+ $defaults->add ('notify', '!',
 6+ 'whether to send a desktop notification when the build passes/fails, use --nonotify to disable',
 7+- 1);
 8++ 0);
 9+ $defaults->add ('halt_on_errors', '!',
 10+ 'whether to abort the build if an error occurs',
 11+ 0);
 12+@@ -316,7 +316,7 @@
 13+ $build_engine = $pkgbuild_path;
 14+ }
 15+
 16+- find_in_path ('notify-send') or $defaults->set ('notify', 0);
 17++ #find_in_path ('notify-send') or $defaults->set ('notify', 0);
 18+ }
 19+
 20+ # return the name of the log file given the id of the spec file
Index: trunk/tools/ts-specs/TSlibmcrypt.spec
——@@ -0,0 +1,109 @@
 2+#
 3+# spec file for package TSlibmcrypt
 4+#
 5+# includes module(s): libmcrypt
 6+
 7+%include Solaris.inc
 8+
 9+Name: TSlibmcrypt
 10+Summary: mcrypt - replacement for the old crypt() package and crypt(1) command
 11+Version: 2.5.8
 12+URL: http://mcrypt.sourceforge.net/
 13+Source: http://ovh.dl.sourceforge.net/sourceforge/mcrypt/libmcrypt-2.5.8.tar.gz
 14+SUNW_BaseDir: %{_basedir}
 15+BuildRoot: %{_tmppath}/%{name}-%{version}-build
 16+
 17+%include default-depend.inc
 18+
 19+%ifarch amd64 sparcv9
 20+%include arch64.inc
 21+%use libmcrypt64=libmcrypt.spec
 22+%endif
 23+%include base.inc
 24+%use libmcrypt=libmcrypt.spec
 25+
 26+%package devel
 27+Summary: %{summary} - development files
 28+SUNW_BaseDir: %{_basedir}
 29+%include default-depend.inc
 30+Requires: %name
 31+
 32+%prep
 33+rm -rf %name-%version
 34+mkdir %name-%version
 35+
 36+%ifarch amd64 sparcv9
 37+mkdir %name-%version/%_arch64
 38+%libmcrypt64.prep -d %name-%version/%_arch64
 39+%endif
 40+
 41+mkdir %name-%version/%{base_arch}
 42+%libmcrypt.prep -d %name-%version/%{base_arch}
 43+
 44+%build
 45+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
 46+if test "x$CPUS" = "x" -o $CPUS = 0; then
 47+ CPUS=1
 48+fi
 49+
 50+export CC="cc"
 51+export CXX="CC"
 52+export CPPFLAGS="-I/usr/sfw/include"
 53+export MSGFMT="/usr/bin/msgfmt"
 54+
 55+%ifarch amd64 sparcv9
 56+%include arch64.inc
 57+export CFLAGS="%optflags -m64 -I/usr/sfw/include -DANSICPP -L/usr/sfw/lib/%_arch64"
 58+export RPM_OPT_FLAGS="$CFLAGS"
 59+export LDFLAGS="-m64 -L/usr/sfw/lib/%_arch64 -R/usr/sfw/lib/%_arch64"
 60+%libmcrypt64.build -d %name-%version/%_arch64
 61+%endif
 62+%include base.inc
 63+export LDFLAGS="-L/usr/sfw/lib -R/usr/sfw/lib"
 64+export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP -L/usr/sfw/lib"
 65+export RPM_OPT_FLAGS="$CFLAGS"
 66+%libmcrypt.build -d %name-%version/%{base_arch}
 67+
 68+%install
 69+%ifarch amd64 sparcv9
 70+%libmcrypt64.install -d %name-%version/%_arch64
 71+rm -f $RPM_BUILD_ROOT%{_libdir}/%_arch64/*.la
 72+%endif
 73+
 74+%libmcrypt.install -d %name-%version/%{base_arch}
 75+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 76+
 77+%clean
 78+rm -rf $RPM_BUILD_ROOT
 79+
 80+%files
 81+%defattr (-, root, bin)
 82+%dir %attr (0755, root, bin) %{_libdir}
 83+%{_libdir}/lib*.so*
 84+%dir %attr (0755, root, bin) %{_libdir}/libmcrypt
 85+%dir %attr(0755, root, sys) %{_datadir}
 86+%dir %attr(0755, root, bin) %{_mandir}
 87+%ifarch amd64 sparcv9
 88+%dir %attr (0755, root, bin) %{_libdir}/%_arch64/libmcrypt
 89+%{_libdir}/%_arch64/lib*.so*
 90+%endif
 91+
 92+%files devel
 93+%defattr (-, root, bin)
 94+%dir %attr (0755, root, bin) %{_bindir}
 95+%{_bindir}/libmcrypt-config
 96+%dir %attr (0755, root, bin) %{_includedir}
 97+%{_includedir}/*
 98+%dir %attr(0755, root, sys) %{_datadir}
 99+%dir %attr(0755, root, other) %{_datadir}/aclocal
 100+%{_datadir}/aclocal/*
 101+%dir %attr(0755, root, bin) %{_mandir}
 102+%dir %attr(0755, root, bin) %{_mandir}/man3
 103+%{_mandir}/man3/*
 104+%ifarch amd64 sparcv9
 105+%{_bindir}/%_arch64/libmcrypt-config
 106+%endif
 107+
 108+%changelog
 109+* Sun Oct 5 2008 - river@wikimedia.org
 110+- initial spec
Index: trunk/tools/ts-specs/TSpkgbuild.spec
——@@ -0,0 +1,55 @@
 2+%include Solaris.inc
 3+
 4+Name: TSpkgbuild
 5+Summary: generates SVR4 packages from RPM spec files
 6+Version: 1.3.3
 7+Source: http://mesh.dl.sourceforge.net/sourceforge/pkgbuild/pkgbuild-%{version}.tar.bz2
 8+Patch0: pkgbuild-01-notify-send.diff
 9+
 10+SUNW_BaseDir: %{_basedir}
 11+BuildRoot: %{_tmppath}/%{name}-%{version}-build
 12+%include default-depend.inc
 13+
 14+# Requires:
 15+
 16+%prep
 17+%setup -q -n pkgbuild-%version
 18+%patch0 -p0
 19+
 20+%build
 21+
 22+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
 23+if test "x$CPUS" = "x" -o $CPUS = 0; then
 24+ CPUS=1
 25+fi
 26+
 27+export CC="cc"
 28+export CXX="CC"
 29+export CFLAGS="%optflags"
 30+export LDFLAGS="%{_ldflags}"
 31+
 32+./configure --prefix=%{_prefix} \
 33+ --sysconfdir=%{_sysconfdir} \
 34+ --mandir=%{_mandir}
 35+
 36+gmake -j$CPUS
 37+
 38+%install
 39+rm -rf $RPM_BUILD_ROOT
 40+
 41+make install DESTDIR=$RPM_BUILD_ROOT
 42+
 43+%clean
 44+rm -rf $RPM_BUILD_ROOT
 45+
 46+%files
 47+%defattr (-, root, bin)
 48+%dir %attr (0755, root, bin) %{_bindir}
 49+%{_bindir}/*
 50+%dir %attr (0755, root, bin) %{_libdir}
 51+%dir %attr (0755, root, bin) %{_libdir}/pkgbuild-%{version}
 52+%{_libdir}/pkgbuild-%{version}/*
 53+
 54+%changelog
 55+* Sun Oct 5 2008 - river@wikimedia.org
 56+- initial spec

Status & tagging log