r48013 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r48012‎ \| r48013 \| r48014 >
Date:	06:23, 4 March 2009
Author:	river
Status:	deferred
Tags:
Comment:	TSexpat, TScairo, TSintltool, TSpixman: new specs TSapu: use TSexpat instead of builtin one
Modified paths:	/trunk/tools/ts-specs/TSapu.spec (modified) (history) /trunk/tools/ts-specs/TScairo.spec (added) (history) /trunk/tools/ts-specs/TSexpat.spec (added) (history) /trunk/tools/ts-specs/TSintltool.spec (added) (history) /trunk/tools/ts-specs/TSpixman.spec (added) (history) /trunk/tools/ts-specs/base-specs/apu.spec (modified) (history) /trunk/tools/ts-specs/base-specs/cairo.spec (added) (history) /trunk/tools/ts-specs/base-specs/expat.spec (added) (history) /trunk/tools/ts-specs/base-specs/pixman.spec (added) (history)

Diff [purge]

Index: trunk/tools/ts-specs/TSpixman.spec
—	—	@@ -0,0 +1,85 @@
	2	+%include Solaris.inc
	3	+
	4	+%include arch64.inc
	5	+%use pixman64=pixman.spec
	6	+%include base.inc
	7	+%use pixman=pixman.spec
	8	+
	9	+Name: %{pixman.name}
	10	+Summary: %{pixman.summary}
	11	+Version: %{pixman.version}
	12	+SUNW_BaseDir: %{_basedir}
	13	+BuildRoot: %{_tmppath}/%{name}-%{version}-build
	14	+
	15	+%include default-depend.inc
	16	+
	17	+%package devel
	18	+Summary: %{summary} - development files
	19	+SUNW_BaseDir: %{_basedir}
	20	+%include default-depend.inc
	21	+Requires: %name
	22	+
	23	+%prep
	24	+rm -rf %name-%version
	25	+mkdir %name-%version
	26	+
	27	+mkdir %name-%version/%_arch64
	28	+%pixman64.prep -d %name-%version/%_arch64
	29	+
	30	+mkdir %name-%version/%{base_arch}
	31	+%pixman.prep -d %name-%version/%{base_arch}
	32	+
	33	+%build
	34	+CPUS=`/usr/sbin/psrinfo \| grep on-line \| wc -l \| tr -d ' '`
	35	+if test "x$CPUS" = "x" -o $CPUS = 0; then
	36	+ CPUS=1
	37	+fi
	38	+
	39	+export CC="cc"
	40	+export CXX="CC"
	41	+
	42	+%include arch64.inc
	43	+export CFLAGS="%optflags"
	44	+export RPM_OPT_FLAGS="$CFLAGS"
	45	+export LDFLAGS="%_ldflags -L/usr/sfw/lib/%_arch64 -R/usr/sfw/lib/%_arch64:%{_libdir}"
	46	+%pixman64.build -d %name-%version/%_arch64
	47	+
	48	+%include base.inc
	49	+export LDFLAGS="%_ldflags -L/usr/sfw/lib -R/usr/sfw/lib:%{_libdir}"
	50	+export CFLAGS="%optflags"
	51	+export RPM_OPT_FLAGS="$CFLAGS"
	52	+%pixman.build -d %name-%version/%{base_arch}
	53	+
	54	+%install
	55	+%pixman64.install -d %name-%version/%_arch64
	56	+rm -f $RPM_BUILD_ROOT%{_libdir}/%_arch64/*.la
	57	+rm -f $RPM_BUILD_ROOT%{_libdir}/%_arch64/*.a
	58	+
	59	+%pixman64.install -d %name-%version/%{base_arch}
	60	+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
	61	+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
	62	+rm -rf $RPM_BUILD_ROOT%{_bindir}/%_arch64
	63	+
	64	+%clean
	65	+rm -rf $RPM_BUILD_ROOT
	66	+
	67	+%files
	68	+%defattr (-, root, bin)
	69	+%dir %attr (0755, root, bin) %{_libdir}
	70	+%{_libdir}/lib.so.
	71	+%dir %attr (0755, root, bin) %{_libdir}/%_arch64
	72	+%{_libdir}/%_arch64/lib.so
	73	+
	74	+%files devel
	75	+%defattr (-, root, bin)
	76	+%dir %attr (0755, root, bin) %{_libdir}
	77	+%{_libdir}/lib*.so
	78	+%dir %attr (0755, root, other) %{_libdir}/pkgconfig
	79	+%{_libdir}/pkgconfig/*
	80	+%dir %attr (0755, root, bin) %{_includedir}
	81	+%dir %attr (0755, root, bin) %{_includedir}/pixman-1
	82	+%{_includedir}/pixman-1/*
	83	+%dir %attr (0755, root, bin) %{_libdir}/%_arch64
	84	+%{_libdir}/%_arch64/lib*.so
	85	+%dir %attr (0755, root, other) %{_libdir}/%_arch64/pkgconfig
	86	+%{_libdir}/%_arch64/pkgconfig/*
Index: trunk/tools/ts-specs/TSintltool.spec
—	—	@@ -0,0 +1,50 @@
	2	+%include Solaris.inc
	3	+
	4	+Name: TSintltool
	5	+Summary: GNOME intltool
	6	+Version: 0.40.5
	7	+Source: http://ftp.gnome.org/pub/gnome/sources/intltool/0.40/intltool-%{version}.tar.gz
	8	+SUNW_BaseDir: %{_basedir}
	9	+BuildRoot: %{_tmppath}/%{name}-%{version}-build
	10	+%include default-depend.inc
	11	+
	12	+%prep
	13	+%setup -q -n intltool-%version
	14	+
	15	+%build
	16	+CPUS=`/usr/sbin/psrinfo \| grep on-line \| wc -l \| tr -d ' '`
	17	+if test "x$CPUS" = "x" -o $CPUS = 0; then
	18	+ CPUS=1
	19	+fi
	20	+
	21	+export CC="cc"
	22	+export CXX="CC"
	23	+export CFLAGS="%optflags"
	24	+export RPM_OPT_FLAGS="$CFLAGS"
	25	+
	26	+./configure --prefix=%{_prefix} \
	27	+ --libexecdir=%{_libexecdir} \
	28	+ --mandir=%{_mandir} \
	29	+ --datadir=%{_datadir} \
	30	+ --infodir=%{_datadir}/info
	31	+
	32	+gmake -j$CPUS
	33	+
	34	+%install
	35	+gmake install DESTDIR=$RPM_BUILD_ROOT
	36	+
	37	+%clean
	38	+rm -rf $RPM_BUILD_ROOT
	39	+
	40	+%files
	41	+%defattr (-, root, bin)
	42	+%dir %attr (0755, root, bin) %{_bindir}
	43	+%{_bindir}/*
	44	+%dir %attr(0755, root, sys) %{_datadir}
	45	+%dir %attr(0755, root, other) %{_datadir}/aclocal
	46	+%{_datadir}/aclocal/*
	47	+%dir %attr(0755, root, other) %{_datadir}/intltool
	48	+%{_datadir}/intltool/*
	49	+%dir %attr(0755, root, bin) %{_mandir}
	50	+%dir %attr(0755, root, bin) %{_mandir}/man8
	51	+%{_mandir}/man8/*
Index: trunk/tools/ts-specs/TSexpat.spec
—	—	@@ -0,0 +1,85 @@
	2	+%include Solaris.inc
	3	+
	4	+%include arch64.inc
	5	+%use expat64=expat.spec
	6	+%include base.inc
	7	+%use expat=expat.spec
	8	+
	9	+Name: %{expat.name}
	10	+Summary: %{expat.summary}
	11	+Version: %{expat.version}
	12	+SUNW_BaseDir: %{_basedir}
	13	+BuildRoot: %{_tmppath}/%{name}-%{version}-build
	14	+
	15	+%include default-depend.inc
	16	+
	17	+%package devel
	18	+Summary: %{summary} - development files
	19	+SUNW_BaseDir: %{_basedir}
	20	+%include default-depend.inc
	21	+Requires: %name
	22	+
	23	+%prep
	24	+rm -rf %name-%version
	25	+mkdir %name-%version
	26	+
	27	+mkdir %name-%version/%_arch64
	28	+%expat64.prep -d %name-%version/%_arch64
	29	+
	30	+mkdir %name-%version/%{base_arch}
	31	+%expat.prep -d %name-%version/%{base_arch}
	32	+
	33	+%build
	34	+CPUS=`/usr/sbin/psrinfo \| grep on-line \| wc -l \| tr -d ' '`
	35	+if test "x$CPUS" = "x" -o $CPUS = 0; then
	36	+ CPUS=1
	37	+fi
	38	+
	39	+export CC="cc"
	40	+export CXX="CC"
	41	+
	42	+%include arch64.inc
	43	+export CFLAGS="%optflags"
	44	+export RPM_OPT_FLAGS="$CFLAGS"
	45	+export LDFLAGS="%_ldflags -L/usr/sfw/lib/%_arch64 -R/usr/sfw/lib/%_arch64:%{_libdir}"
	46	+%expat64.build -d %name-%version/%_arch64
	47	+
	48	+%include base.inc
	49	+export LDFLAGS="%_ldflags -L/usr/sfw/lib -R/usr/sfw/lib:%{_libdir}"
	50	+export CFLAGS="%optflags"
	51	+export RPM_OPT_FLAGS="$CFLAGS"
	52	+%expat.build -d %name-%version/%{base_arch}
	53	+
	54	+%install
	55	+%expat64.install -d %name-%version/%_arch64
	56	+rm -f $RPM_BUILD_ROOT%{_libdir}/%_arch64/*.la
	57	+rm -f $RPM_BUILD_ROOT%{_libdir}/%_arch64/*.a
	58	+
	59	+%expat64.install -d %name-%version/%{base_arch}
	60	+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
	61	+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
	62	+rm -rf $RPM_BUILD_ROOT%{_bindir}/%_arch64
	63	+
	64	+%clean
	65	+rm -rf $RPM_BUILD_ROOT
	66	+
	67	+%files
	68	+%defattr (-, root, bin)
	69	+%dir %attr (0755, root, bin) %{_bindir}
	70	+%{_bindir}/*
	71	+%dir %attr (0755, root, bin) %{_libdir}
	72	+%{_libdir}/lib.so.
	73	+%dir %attr(0755, root, sys) %{_datadir}
	74	+%dir %attr(0755, root, bin) %{_mandir}/man1
	75	+%{_mandir}/man1/*
	76	+%dir %attr (0755, root, bin) %{_libdir}/%_arch64
	77	+%{_libdir}/%_arch64/lib.so
	78	+
	79	+%files devel
	80	+%defattr (-, root, bin)
	81	+%dir %attr (0755, root, bin) %{_libdir}
	82	+%{_libdir}/lib*.so
	83	+%dir %attr (0755, root, bin) %{_includedir}
	84	+%{_includedir}/*
	85	+%dir %attr (0755, root, bin) %{_libdir}/%_arch64
	86	+%{_libdir}/%_arch64/lib*.so
Index: trunk/tools/ts-specs/base-specs/expat.spec
—	—	@@ -0,0 +1,31 @@
	2	+Name: TSexpat
	3	+Summary: Expat library
	4	+Version: 2.0.1
	5	+Source: http://surfnet.dl.sourceforge.net/sourceforge/expat/expat-%{version}.tar.gz
	6	+SUNW_BaseDir: %{_basedir}
	7	+BuildRoot: %{_tmppath}/%{name}-%{version}-build
	8	+
	9	+%include default-depend.inc
	10	+
	11	+%prep
	12	+rm -rf %name-%version
	13	+%setup -q -n expat-%version
	14	+
	15	+%build
	16	+
	17	+./configure --prefix=%{_prefix} \
	18	+ --bindir=%{_bindir} \
	19	+ --includedir=%{_includedir} \
	20	+ --mandir=%{_mandir} \
	21	+ --libdir=%{_libdir} \
	22	+ --disable-static \
	23	+ --enable-shared \
	24	+ %{?configure_options}
	25	+
	26	+gmake -j$CPUS all
	27	+
	28	+%install
	29	+gmake DESTDIR=${RPM_BUILD_ROOT} install
	30	+
	31	+%clean
	32	+rm -rf $RPM_BUILD_ROOT
Index: trunk/tools/ts-specs/base-specs/apu.spec
—	—	@@ -21,7 +21,8 @@
22	22	--bindir=%{_bindir} \
23	23	--with-apr=$APR_CONFIG \
24	24	--includedir=$INCDIR \
25		~~- --with-ldap=ldap~~
	25	+ --with-ldap=ldap \
	26	+ --with-expat=/opt/ts
26	27
27	28	#--with-iconv=/opt/ts
28	29
Index: trunk/tools/ts-specs/base-specs/pixman.spec
—	—	@@ -0,0 +1,33 @@
	2	+Name: TSpixman
	3	+Summary: pixman library
	4	+Version: 0.14.0
	5	+Source: http://cairographics.org/releases/pixman-%{version}.tar.gz
	6	+SUNW_BaseDir: %{_basedir}
	7	+BuildRoot: %{_tmppath}/%{name}-%{version}-build
	8	+
	9	+%include default-depend.inc
	10	+
	11	+%prep
	12	+rm -rf %name-%version
	13	+%setup -q -n pixman-%version
	14	+
	15	+%build
	16	+
	17	+./configure --prefix=%{_prefix} \
	18	+ --bindir=%{_bindir} \
	19	+ --includedir=%{_includedir} \
	20	+ --mandir=%{_mandir} \
	21	+ --libdir=%{_libdir} \
	22	+ --enable-rpath \
	23	+ --disable-static \
	24	+ --enable-shared \
	25	+ --disable-gtk \
	26	+ %{?configure_options}
	27	+
	28	+gmake -j$CPUS all
	29	+
	30	+%install
	31	+gmake DESTDIR=${RPM_BUILD_ROOT} install
	32	+
	33	+%clean
	34	+rm -rf $RPM_BUILD_ROOT
Index: trunk/tools/ts-specs/base-specs/cairo.spec
—	—	@@ -0,0 +1,33 @@
	2	+Name: TScairo
	3	+Summary: Cairo vector graphics library
	4	+Version: 1.8.6
	5	+Source: http://cairographics.org/releases/cairo-%{version}.tar.gz
	6	+SUNW_BaseDir: %{_basedir}
	7	+BuildRoot: %{_tmppath}/%{name}-%{version}-build
	8	+
	9	+%include default-depend.inc
	10	+
	11	+%prep
	12	+rm -rf %name-%version
	13	+%setup -q -n cairo-%version
	14	+
	15	+%build
	16	+
	17	+./configure --prefix=%{_prefix} \
	18	+ --bindir=%{_bindir} \
	19	+ --includedir=%{_includedir} \
	20	+ --mandir=%{_mandir} \
	21	+ --libdir=%{_libdir} \
	22	+ --disable-static \
	23	+ --enable-shared \
	24	+ --without-x \
	25	+ --enable-svg=yes \
	26	+ %{?configure_options}
	27	+
	28	+gmake -j$CPUS all
	29	+
	30	+%install
	31	+gmake DESTDIR=${RPM_BUILD_ROOT} install
	32	+
	33	+%clean
	34	+rm -rf $RPM_BUILD_ROOT
Index: trunk/tools/ts-specs/TScairo.spec
—	—	@@ -0,0 +1,93 @@
	2	+%include Solaris.inc
	3	+
	4	+%include arch64.inc
	5	+%use cairo64=cairo.spec
	6	+%include base.inc
	7	+%use cairo=cairo.spec
	8	+
	9	+Name: %{cairo.name}
	10	+Summary: %{cairo.summary}
	11	+Version: %{cairo.version}
	12	+SUNW_BaseDir: %{_basedir}
	13	+BuildRoot: %{_tmppath}/%{name}-%{version}-build
	14	+
	15	+Requires: TSpixman
	16	+BuildRequires: TSpixman-devel
	17	+
	18	+%include default-depend.inc
	19	+
	20	+%package devel
	21	+Summary: %{summary} - development files
	22	+SUNW_BaseDir: %{_basedir}
	23	+%include default-depend.inc
	24	+Requires: %name
	25	+
	26	+%prep
	27	+rm -rf %name-%version
	28	+mkdir %name-%version
	29	+
	30	+mkdir %name-%version/%_arch64
	31	+%cairo64.prep -d %name-%version/%_arch64
	32	+
	33	+mkdir %name-%version/%{base_arch}
	34	+%cairo.prep -d %name-%version/%{base_arch}
	35	+
	36	+%build
	37	+CPUS=`/usr/sbin/psrinfo \| grep on-line \| wc -l \| tr -d ' '`
	38	+if test "x$CPUS" = "x" -o $CPUS = 0; then
	39	+ CPUS=1
	40	+fi
	41	+
	42	+export CC="cc"
	43	+export CXX="CC"
	44	+
	45	+%include arch64.inc
	46	+export CFLAGS="%optflags"
	47	+export RPM_OPT_FLAGS="$CFLAGS"
	48	+export LDFLAGS="%_ldflags -L/usr/sfw/lib/%_arch64 -R/usr/sfw/lib/%_arch64:%{_libdir}"
	49	+export PKG_CONFIG_PATH=/opt/ts/lib/%_arch64/pkgconfig:/usr/lib/%_arch64/pkgconfig:/usr/sfw/lib/%_arch64/pkgconfig
	50	+%cairo64.build -d %name-%version/%_arch64
	51	+
	52	+%include base.inc
	53	+export LDFLAGS="%_ldflags -L/usr/sfw/lib -R/usr/sfw/lib:%{_libdir}"
	54	+export CFLAGS="%optflags"
	55	+export RPM_OPT_FLAGS="$CFLAGS"
	56	+export PKG_CONFIG_PATH=/opt/ts/lib/pkgconfig:/usr/lib/pkgconfig:/usr/sfw/lib/pkgconfig
	57	+%cairo.build -d %name-%version/%{base_arch}
	58	+
	59	+%install
	60	+%cairo64.install -d %name-%version/%_arch64
	61	+rm -f $RPM_BUILD_ROOT%{_libdir}/%_arch64/*.la
	62	+rm -f $RPM_BUILD_ROOT%{_libdir}/%_arch64/*.a
	63	+
	64	+%cairo64.install -d %name-%version/%{base_arch}
	65	+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
	66	+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
	67	+rm -rf $RPM_BUILD_ROOT%{_bindir}/%_arch64
	68	+
	69	+%clean
	70	+rm -rf $RPM_BUILD_ROOT
	71	+
	72	+%files
	73	+%defattr (-, root, bin)
	74	+%dir %attr (0755, root, bin) %{_libdir}
	75	+%{_libdir}/lib.so.
	76	+%dir %attr (0755, root, bin) %{_libdir}/%_arch64
	77	+%{_libdir}/%_arch64/lib.so
	78	+
	79	+%files devel
	80	+%defattr (-, root, bin)
	81	+%dir %attr (0755, root, bin) %{_libdir}
	82	+%{_libdir}/lib*.so
	83	+%dir %attr (0755, root, other) %{_libdir}/pkgconfig
	84	+%{_libdir}/pkgconfig/*
	85	+%dir %attr(0755, root, sys) %{_datadir}
	86	+%dir %attr(0755, root, other) %{_datadir}/gtk-doc
	87	+%{_datadir}/gtk-doc/*
	88	+%dir %attr (0755, root, bin) %{_includedir}
	89	+%dir %attr (0755, root, bin) %{_includedir}/cairo
	90	+%{_includedir}/cairo/*
	91	+%dir %attr (0755, root, bin) %{_libdir}/%_arch64
	92	+%{_libdir}/%_arch64/lib*.so
	93	+%dir %attr (0755, root, other) %{_libdir}/%_arch64/pkgconfig
	94	+%{_libdir}/%_arch64/pkgconfig/*
Index: trunk/tools/ts-specs/TSapu.spec
—	—	@@ -1,9 +1,7 @@
2	2	%include Solaris.inc
3	3
4		~~-%ifarch amd64 sparcv9~~
5	4	%include arch64.inc
6	5	%use apu_64 = apu.spec
7		~~-%endif~~
8	6
9	7	%include base.inc
10	8	%use apu = apu.spec
—	—	@@ -17,6 +15,9 @@
18	16	BuildRoot: %{_tmppath}/apu-%{version}-build
19	17	%include default-depend.inc
20	18
	19	+Requires: TSexpat
	20	+BuildRequires: TSexpat-devel
	21	+
21	22	%package devel
22	23	Summary: %{summary} - development files
23	24	SUNW_BaseDir: %{_basedir}
—	—	@@ -27,24 +28,20 @@
28	29	rm -rf %name-%version
29	30	mkdir %name-%version
30	31
31		~~-%ifarch amd64 sparcv9~~
32	32	export APR_CONFIG=%{_prefix}/bin/%_arch64/apr-1-config
33		~~-export INCDIR=%{_includedir}/%_arch64~~
	33	+export INCDIR=%{_includedir}/%base_arch
34	34	mkdir %name-%version/%_arch64
35	35	%apu_64.prep -d %name-%version/%_arch64
36		~~-%endif~~
37	36
38	37	mkdir %name-%version/%base_arch
39	38	export APR_CONFIG=%{_prefix}/bin/apr-1-config
40		~~-export INCDIR=%{_includedir}/%base_arch~~
	39	+export INCDIR=%{_includedir}/%_arch64
41	40	%apu.prep -d %name-%version/%base_arch
42	41
43	42	%build
44		~~-%ifarch amd64 sparcv9~~
45	43	export APR_CONFIG=%{_prefix}/bin/%_arch64/apr-1-config
46	44	export INCDIR=%{_includedir}/%_arch64
47	45	%apu_64.build -d %name-%version/%_arch64
48		~~-%endif~~
49	46
50	47	export APR_CONFIG=%{_prefix}/bin/apr-1-config
51	48	export INCDIR=%{_includedir}/%base_arch
—	—	@@ -53,10 +50,7 @@
54	51	%install
55	52	rm -rf $RPM_BUILD_ROOT
56	53
57		~~-%ifarch amd64 sparcv9~~
58	54	%apu_64.install -d %name-%version/%_arch64
59		~~-%endif~~
60		-
61	55	%apu.install -d %name-%version/%base_arch
62	56
63	57	%clean
—	—	@@ -68,12 +62,10 @@
69	63	%{_libdir}/.so.
70	64	%dir %attr (0755, root, bin) %{_libdir}/apr-util-1
71	65	%{_libdir}/apr-util-1/*.so
72		~~-%ifarch amd64 sparcv9~~
73	66	%dir %attr (0755, root, bin) %{_libdir}/%_arch64
74	67	%{_libdir}/%_arch64/.so.
75	68	%dir %attr (0755, root, bin) %{_libdir}/%_arch64/apr-util-1
76	69	%{_libdir}/%_arch64/apr-util-1/*.so
77		~~-%endif~~
78	70
79	71	%files devel
80	72	%defattr(-,root,bin)
—	—	@@ -84,18 +76,9 @@
85	77	%{_libdir}/pkgconfig/*
86	78	%dir %attr (0755, root, bin) %{_libdir}
87	79	%{_libdir}/*.so
88		~~-%ifarch amd64 sparcv9~~
89	80	%dir %attr (0755, root, bin) %{_libdir}/%{_arch64}
90	81	%{_libdir}/%{_arch64}/*.so
91	82	%dir %attr (0755, root, other) %{_libdir}/%{_arch64}/pkgconfig
92	83	%{_libdir}/%{_arch64}/pkgconfig/*
93		~~-%endif~~
94		-
95	84	%dir %attr (0755, root, bin) %{_bindir}
96	85	%{_bindir}/*
97		-
98		~~-%changelog~~
99		~~-* Mon Feb 23 2009 - river@loreley.flyingparchment.org.uk~~
100		~~-- 1.3.4~~
101		~~-* Wed Jul 9 2008 - river@wikimedia.org~~
102		~~-- initial spec~~

Status & tagging log

14:33, 4 March 2009 Aaron Schulz (talk | contribs) changed the status of r48013 [removed: new added: deferred]