From: <vi...@us...> - 2011-01-25 09:58:16
|
Revision: 3133 http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=3133&view=rev Author: viskov Date: 2011-01-25 09:58:08 +0000 (Tue, 25 Jan 2011) Log Message: ----------- SFEdictd.spec: update to 1.12.0 SFElibmaa.spec: initial spec (new dependency of SFEdictd) SFErcs.spec: initial spec SFElibmpdclient.spec: remove dependency on SFEmpd SFEmpdscribble.spec: define CFLAGS and LDFLAGS Modified Paths: -------------- spec-files-extra/trunk/ChangeLog spec-files-extra/trunk/SFEdictd.spec spec-files-extra/trunk/SFElibmpdclient.spec spec-files-extra/trunk/SFEmpdscribble.spec Added Paths: ----------- spec-files-extra/trunk/SFElibmaa.spec spec-files-extra/trunk/SFErcs.spec spec-files-extra/trunk/patches/dictd-01-Makefile.diff Removed Paths: ------------- spec-files-extra/trunk/patches/mkvtoolnix-01-git-version.diff.bz2 spec-files-extra/trunk/patches/mkvtoolnix-05-bug-567-patch.diff Modified: spec-files-extra/trunk/ChangeLog =================================================================== --- spec-files-extra/trunk/ChangeLog 2011-01-25 08:42:16 UTC (rev 3132) +++ spec-files-extra/trunk/ChangeLog 2011-01-25 09:58:08 UTC (rev 3133) @@ -1,3 +1,9 @@ +2010-01-25 Alex Viskovatoff <vis...@im...> + + * SFEdictd.spec: update to 1.12.0 + * SFElibmaa.spec: initial spec (new dependency of SFEdictd) + * SFErcs.spec: initial spec + 2011-01-25 Milan Jurik <sf...@xy...> * SFEgeany.spec: bump to 0.20 Modified: spec-files-extra/trunk/SFEdictd.spec =================================================================== --- spec-files-extra/trunk/SFEdictd.spec 2011-01-25 08:42:16 UTC (rev 3132) +++ spec-files-extra/trunk/SFEdictd.spec 2011-01-25 09:58:08 UTC (rev 3133) @@ -4,22 +4,38 @@ # includes module(s): dictd # %include Solaris.inc +%define srcname dictd Name: SFEdictd Summary: Dictd Server and Client -Version: 1.9.15 -Source: ftp://ftp.dict.org/dict/dictd-%{version}.tar.gz +Version: 1.12.0 URL: http://dict.org -#SUNW_BaseDir: %{_basedir} +License: GPLv2 +Source: %sf_download/project/dict/%srcname/%srcname-%version/%srcname-%version.tar.gz +Patch1: dictd-01-Makefile.diff +SUNW_BaseDir: %{_basedir} BuildRoot: %{_tmppath}/%{name}-%{version}-build %include default-depend.inc Requires: SUNWcsu +BuildRequires: SFElibmaa-devel +Requires: SFElibmaa +Requires: %name-root +%package root +Summary: %{summary} - / filesystem +SUNW_BaseDir: / +Requires: %name + + %prep %setup -q -n dictd-%version +%patch1 -p1 +export CFLAGS="%optflags" +export LDFLAGS="%_ldflags" + %build ./configure --prefix=%{_prefix} \ --mandir=%{_mandir} \ @@ -29,16 +45,22 @@ --sysconfdir=%{_sysconfdir} \ --datadir=%{_datadir} \ +# Use libxnet instead of libsocket +sed 's/-lnsl -lsocket/-lxnet -lnsl/' Makefile > Makefile.xnet +mv Makefile.xnet Makefile + gmake + %install gmake install DESTDIR=$RPM_BUILD_ROOT -mkdir $RPM_BUILD_ROOT/etc -echo "server dict.org" > /$RPM_BUILD_ROOT/etc/dict.conf +mkdir $RPM_BUILD_ROOT%_sysconfdir +echo "server dict.org" > $RPM_BUILD_ROOT%_sysconfdir/dict.conf %clean rm -rf $RPM_BUILD_ROOT + %files %defattr (-, root, sys) @@ -57,12 +79,16 @@ %dir %attr (0755, root, bin) %{_includedir} %{_includedir}/* -%attr (0755, root, sys) %dir %{_sysconfdir} -%{_sysconfdir}/* +%files root +%defattr (-, root, sys) +%dir %attr (0755, root, sys) %{_sysconfdir} +%attr (-, root, root) %{_sysconfdir}/dict.conf + %changelog +* Tue Jan 25 2011 - Alex Viskovatoff +- Update to 1.12.0 * Jun 19 2010 - pradhap (at) gmail.com - Fixed URL * Mar 29 2008 - pradhap (at) gmail.com - Initial dictd spec file. - Added: spec-files-extra/trunk/SFElibmaa.spec =================================================================== --- spec-files-extra/trunk/SFElibmaa.spec (rev 0) +++ spec-files-extra/trunk/SFElibmaa.spec 2011-01-25 09:58:08 UTC (rev 3133) @@ -0,0 +1,75 @@ +# +# spec file for package SFElibmpdclient +# +# includes module: libmpdclient +# + +%include Solaris.inc +%define srcname libmaa + +Name: SFElibmaa +Summary: Library consisting of code that was previously part of dictd +URL: https://sourceforge.net/projects/dict/ +Vendor: Aleksey Cheusov +Version: 1.2.0 +License: GPLv2 +Source: %sf_download/project/dict/%srcname/%srcname-%version/%srcname-%version.tar.gz +SUNW_BaseDir: %_basedir +BuildRoot: %_tmppath/%name-%version-build +%include default-depend.inc + +BuildRequires: SUNWscpu + +%package devel +Summary: %summary - development files +SUNW_BaseDir: %_basedir +%include default-depend.inc +Requires: %name + + +%prep +%setup -q -n %srcname-%version + + +%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" +export LDFLAGS="%_ldflags" + +./configure --prefix=%_prefix + +# Be modern and use libxnet instead of libsocket +#sed 's/-lsocket -lnsl/-lxnet/' Makefile > Makefile.xnet +#mv Makefile.xnet Makefile + +gmake -j$CPUS + + +%install +rm -rf $RPM_BUILD_ROOT +gmake install DESTDIR=$RPM_BUILD_ROOT +rm $RPM_BUILD_ROOT%_libdir/*.la + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr (-, root, bin) +%dir %attr (0755, root, bin) %_libdir +%_libdir/libmaa.so* + +%files devel +%defattr (-, root, bin) +%dir %attr (0755, root, bin) %_includedir +%_includedir/maa.h + + +%changelog +* Tue Jan 25 2011 - Alex Viskovatoff +- Initial spec Modified: spec-files-extra/trunk/SFElibmpdclient.spec =================================================================== --- spec-files-extra/trunk/SFElibmpdclient.spec 2011-01-25 08:42:16 UTC (rev 3132) +++ spec-files-extra/trunk/SFElibmpdclient.spec 2011-01-25 09:58:08 UTC (rev 3133) @@ -13,15 +13,12 @@ Vendor: Max Kellermann Version: 2.4 License: BSD revised -Source: http://downloads.sourceforge.net/project/musicpd/%srcname/%version/%srcname-%version.tar.bz2 +Source: %sf_download/project/musicpd/%srcname/%version/%srcname-%version.tar.bz2 SUNW_BaseDir: %_basedir BuildRoot: %_tmppath/%name-%version-build %include default-depend.inc -BuildRequires: SFEmpd -Requires: SFEmpd - %package devel Summary: %summary - development files SUNW_BaseDir: %_basedir @@ -40,6 +37,9 @@ CPUS=1 fi +export CFLAGS="%optflags" +export LDFLAGS="%_ldflags" + # --disable-static doesn't do what it's supposed to, but use it anyway ./configure --prefix=%_prefix --disable-static Modified: spec-files-extra/trunk/SFEmpdscribble.spec =================================================================== --- spec-files-extra/trunk/SFEmpdscribble.spec 2011-01-25 08:42:16 UTC (rev 3132) +++ spec-files-extra/trunk/SFEmpdscribble.spec 2011-01-25 09:58:08 UTC (rev 3133) @@ -39,6 +39,9 @@ CPUS=1 fi +export CFLAGS="%optflags" +export LDFLAGS="%_ldflags" + ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir # Be modern and use libxnet instead of libsocket Added: spec-files-extra/trunk/SFErcs.spec =================================================================== --- spec-files-extra/trunk/SFErcs.spec (rev 0) +++ spec-files-extra/trunk/SFErcs.spec 2011-01-25 09:58:08 UTC (rev 3133) @@ -0,0 +1,68 @@ +# +# spec file for package SFErcs +# +# includes module: rcs +# + +%include Solaris.inc +%define srcname rcs + +Name: SFErcs +Summary: GNU Revision Control System +URL: http://www.cs.purdue.edu/homes/trinkle/RCS/ +Vendor: GNU Project +Version: 5.7 +License: GPLv2 +Source: http://www.cs.purdue.edu/homes/trinkle/RCS/%srcname-%version.tar.Z +SUNW_BaseDir: %_basedir +BuildRoot: %_tmppath/%name-%version-build +%include default-depend.inc + + +%prep +%setup -q -n %srcname-%version + + +%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" +export LDFLAGS="%_ldflags" + +./configure --prefix=$RPM_BUILD_ROOT%_prefix + +gmake -j$CPUS + + +%install +rm -rf $RPM_BUILD_ROOT +gmake install + +cd $RPM_BUILD_ROOT%_prefix +mkdir share +mv man share + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr (-, root, bin) +%dir %attr (0755, root, bin) %_bindir +%_bindir/* +%dir %attr (0755, root, sys) %_datadir +%dir %attr (0755, root, bin) %_mandir +%dir %attr (0755, root, bin) %_mandir/man1 +%_mandir/man1/*.1 +%dir %attr (0755, root, bin) %_mandir/man5 +%_mandir/man5/rcsfile.5 + + +%changelog +* Tue Jan 18 2011 - Alex Viskovatoff +- Initial spec Added: spec-files-extra/trunk/patches/dictd-01-Makefile.diff =================================================================== --- spec-files-extra/trunk/patches/dictd-01-Makefile.diff (rev 0) +++ spec-files-extra/trunk/patches/dictd-01-Makefile.diff 2011-01-25 09:58:08 UTC (rev 3133) @@ -0,0 +1,10 @@ +--- dictd-1.12.0/Makefile.in.orig Sun Jan 9 14:34:55 2011 ++++ dictd-1.12.0/Makefile.in Mon Jan 24 21:27:41 2011 +@@ -118,6 +118,7 @@ + + %.o: %.c + $(LIBTOOL) --tag=CC --mode=compile $(CC) -c $(CFLAGS) $< -o $@ ++ mv .libs/* . + %.o: %.cpp + $(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c $(CFLAGS) $< -o $@ + Deleted: spec-files-extra/trunk/patches/mkvtoolnix-01-git-version.diff.bz2 =================================================================== (Binary files differ) Deleted: spec-files-extra/trunk/patches/mkvtoolnix-05-bug-567-patch.diff =================================================================== --- spec-files-extra/trunk/patches/mkvtoolnix-05-bug-567-patch.diff 2011-01-25 08:42:16 UTC (rev 3132) +++ spec-files-extra/trunk/patches/mkvtoolnix-05-bug-567-patch.diff 2011-01-25 09:58:08 UTC (rev 3133) @@ -1,25 +0,0 @@ -diff --git a/src/common/memory.h b/src/common/memory.h -index 2d902d7..328303b 100644 ---- a/src/common/memory.h -+++ b/src/common/memory.h -@@ -220,10 +220,17 @@ class MTX_DLL_API memory_slice_cursor_c { - if (slice->get_size() == 0) - return; - -- m_slices.push_back(slice); -- m_size += slice->get_size(); -- if (m_slice == m_slices.end()) -+ if (m_slices.end() == m_slice) { -+ m_slices.push_back(slice); - m_slice = m_slices.begin(); -+ -+ } else { -+ size_t pos = std::distance(m_slices.begin(), m_slice); -+ m_slices.push_back(slice); -+ m_slice = m_slices.begin() + pos; -+ } -+ -+ m_size += slice->get_size(); - } - - void add_slice(unsigned char *buffer, size_t size) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |