DISTFILES: kde4-kdebase-workspace: kde-workspace-4.11.5.tar.xz
Files fetched: 1 STORED: ftp://ftp.kde.org/pub/kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz 2bed3dcf2860ceba4609ae64a8bac923 kde-workspace-4.11.5.tar.xz Size: 13714748 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/kde4-kdebase-workspace] - up to 4.11.5
commit 2294463aa5821527cfd9ec7c3da932984c03d043 Author: Arkadiusz Miśkiewicz Date: Wed Jan 8 07:20:54 2014 +0100 - up to 4.11.5 kde4-kdebase-workspace.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/kde4-kdebase-workspace.spec b/kde4-kdebase-workspace.spec index 4035b77..cebe686 100644 --- a/kde4-kdebase-workspace.spec +++ b/kde4-kdebase-workspace.spec @@ -7,12 +7,12 @@ Summary: KDE 4 base workspace components Summary(pl.UTF-8): Podstawowe komponenty środowiska KDE 4 Name: kde4-kdebase-workspace -Version: 4.11.4 -Release: 2 +Version: 4.11.5 +Release: 1 License: GPL v2+ Group: X11/Applications Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz -# Source0-md5: 20266e6cc89a3fa96619c69452c78108 +# Source0-md5: 2bed3dcf2860ceba4609ae64a8bac923 Source1: kdebase-kdesktop.pam Source2: kdebase-kdm.pam Source3: kdebase-kdm-np.pam gitweb: http://git.pld-linux.org/gitweb.cgi/packages/kde4-kdebase-workspace.git/commitdiff/2294463aa5821527cfd9ec7c3da932984c03d043 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/hhvm] use HHVM in compiler_id
commit df52bbfc4e40d177c6a939c689fce71793aea9d2 Author: Elan Ruusamäe Date: Tue Jan 7 22:46:24 2014 + use HHVM in compiler_id hhvm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/hhvm.spec b/hhvm.spec index 4f700b5..4a83152 100644 --- a/hhvm.spec +++ b/hhvm.spec @@ -260,7 +260,7 @@ cd build # setup COMPILER_ID/HHVM_REPO_SCHEMA so it doesn't look it up from our package git repo # see hphp/util/generate-buildinfo.sh -export COMPILER_ID=HPHP-%{version}-%{release}-%{githash} +export COMPILER_ID=HHVM-%{version}-%{release}-%{githash} export HHVM_REPO_SCHEMA=$(date +%N_%s) %{__make} gitweb: http://git.pld-linux.org/gitweb.cgi/packages/hhvm.git/commitdiff/df52bbfc4e40d177c6a939c689fce71793aea9d2 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/hhvm] build without debug
commit ff711f1f077636aa68a3f96140e08c1dc0c919ce Author: Elan Ruusamäe Date: Wed Jan 8 00:40:00 2014 +0200 build without debug debug got enabled due pld way of overriding build type hhvm.spec | 4 +++- no-debug.patch | 17 + 2 files changed, 20 insertions(+), 1 deletion(-) --- diff --git a/hhvm.spec b/hhvm.spec index 93953e6..4f700b5 100644 --- a/hhvm.spec +++ b/hhvm.spec @@ -7,7 +7,7 @@ Summary: Virtual Machine, Runtime, and JIT for PHP Name: hhvm Version: 2.3.2 -Release: 0.22 +Release: 0.24 License: PHP 3.01 Group: Development/Languages Source0: https://github.com/facebook/hhvm/archive/HHVM-%{version}.tar.gz @@ -29,6 +29,7 @@ Patch6: checksum.patch Patch7:imap-gss.patch Patch8:hphpize.patch Patch9:notest.patch +Patch10: no-debug.patch URL: http://wiki.github.com/facebook/hiphop-php/ BuildRequires: apr-devel BuildRequires: autoconf @@ -190,6 +191,7 @@ mv folly-*/* hphp/submodules/folly %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 #%patch5 -p1 # prefer ones from system diff --git a/no-debug.patch b/no-debug.patch new file mode 100644 index 000..3527fff --- /dev/null +++ b/no-debug.patch @@ -0,0 +1,17 @@ +as pld sets CMAKE_BUILD_TYPE to PLD, conditions like this fail: + +if (${CMAKE_BUILD_TYPE} MATCHES "Release") + +mabe PLDRelease would do better? + +--- hhvm/CMake/HPHPSetup.cmake~2014-01-07 22:15:26.600836165 +0200 hhvm/CMake/HPHPSetup.cmake 2014-01-07 22:46:26.036361039 +0200 +@@ -69,7 +69,7 @@ + add_definitions(-D_GNU_SOURCE) + endif() + +-if(${CMAKE_BUILD_TYPE} MATCHES "Release") ++if(NOT ${CMAKE_BUILD_TYPE} MATCHES "Debug") + add_definitions(-DRELEASE=1) + add_definitions(-DNDEBUG) + message("Generating Release build") gitweb: http://git.pld-linux.org/gitweb.cgi/packages/hhvm.git/commitdiff/df52bbfc4e40d177c6a939c689fce71793aea9d2 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: phpMyAdmin: phpMyAdmin-4.1.4-all-languages.tar.xz
Files fetched: 1 STORED: http://downloads.sourceforge.net/phpmyadmin/phpMyAdmin-4.1.4-all-languages.tar.xz 9802ba0a7ee6afd8941dc8d0af589913 phpMyAdmin-4.1.4-all-languages.tar.xz Size: 4901576 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/phpMyAdmin] - updated to 4.1.4 - included examples dir content which is required in case of pmadb migration from
commit 054dddf6108532e8196e755368f3c8d1d263001d Author: Łukasz Kieś Date: Tue Jan 7 22:31:25 2014 +0100 - updated to 4.1.4 - included examples dir content which is required in case of pmadb migration from 4.0 to 4.1 - R: mysql-libs >= 5.5 (version 4.1.x requires at least mysql 5.5) - reported by shadzik phpMyAdmin.spec | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) --- diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index 983e0e4..4e06742 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -4,12 +4,12 @@ Summary: phpMyAdmin - web-based MySQL administration Summary(pl.UTF-8): phpMyAdmin - administracja bazami MySQL przez WWW Name: phpMyAdmin -Version: 4.1.3 +Version: 4.1.4 Release: 1 License: GPL v2 Group: Applications/Databases/Interfaces Source0: http://downloads.sourceforge.net/phpmyadmin/%{name}-%{version}-all-languages.tar.xz -# Source0-md5: fc4a1851c3f425e12a4aa4091a28e0af +# Source0-md5: 9802ba0a7ee6afd8941dc8d0af589913 Source1: %{name}-apache.conf Source2: %{name}-lighttpd.conf Source3: %{name}-httpd.conf @@ -20,6 +20,8 @@ URL: http://www.phpmyadmin.net/ BuildRequires: rpmbuild(macros) >= 1.268 BuildRequires: tar >= 1:1.22 BuildRequires: xz +# phpMyAdmin doesn't support mysql < 5.5 and won't work with php < 5.3 +Requires: mysql-libs >= 5.5 Requires: php(core) >= 5.3 Requires: php(ctype) Requires: php(filter) @@ -126,7 +128,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc ChangeLog README +%doc ChangeLog README examples %dir %attr(750,root,http) %{_sysconfdir} %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf gitweb: http://git.pld-linux.org/gitweb.cgi/packages/phpMyAdmin.git/commitdiff/054dddf6108532e8196e755368f3c8d1d263001d ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: mono-addins: mono-addins-1.0.tar.gz
Files fetched: 1 STORED: https://github.com/mono/mono-addins/archive/mono-addins-1.0.tar.gz d4c87fbfd46584a0f1fb56169e78f6d7 mono-addins-1.0.tar.gz Size: 548940 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/mono-addins] - updated to 1.0 (from github) - updated monodir patch, removed obsolete automake patch - added buil
commit 0e6837a3afc25e4eb20c8acdd252033b37bd0e62 Author: Jakub Bogusz Date: Tue Jan 7 21:45:42 2014 +0100 - updated to 1.0 (from github) - updated monodir patch, removed obsolete automake patch - added build patch (fixes gtk-sharp2 vs cairo version mismatch) - build monodocs, added destdir patch to fix install mono-addins-automake.patch | 13 - mono-addins-build.patch | 12 mono-addins-monodir.patch | 39 +++ mono-addins-pkglibdir.patch | 30 -- mono-addins.spec| 44 +--- 5 files changed, 64 insertions(+), 74 deletions(-) --- diff --git a/mono-addins.spec b/mono-addins.spec index 3316ea9..faecc69 100644 --- a/mono-addins.spec +++ b/mono-addins.spec @@ -1,23 +1,32 @@ +# +# Conditional build: +%bcond_without monodoc # monodoc documentation +%bcond_withtests # "make test" call [fails on UnitTests load???] +# %include /usr/lib/rpm/macros.mono Summary: Mono.Addins - framework for creating extensible applications and libraries Summary(pl.UTF-8): Mono.Addins - framework do tworzenia elastycznych aplikacji i bibliotek Name: mono-addins -Version: 0.6.2 -Release: 2 +Version: 1.0 +Release: 1 License: MIT Group: Development/Tools -# latest downloads summary at http://download.mono-project.com/sources-stable/ -Source0: http://download.mono-project.com/sources/mono-addins/%{name}-%{version}.tar.bz2 -# Source0-md5: afbbe5e9fdf9b03911bc8e6b94feb60b +# latest is 0.6.2 here +#Source0: http://download.mono-project.com/sources/mono-addins/%{name}-%{version}.tar.bz2 +# newer releases available on http://monoaddins.codeplex.com/ (requiring JS and POST forms) or github +Source0: https://github.com/mono/mono-addins/archive/mono-addins-1.0.tar.gz +# Source0-md5: d4c87fbfd46584a0f1fb56169e78f6d7 Patch0:%{name}-monodir.patch -Patch1:%{name}-automake.patch +Patch1:%{name}-build.patch +Patch2:%{name}-destdir.patch URL: http://www.mono-project.com/Mono.Addins BuildRequires: autoconf >= 2.54 BuildRequires: automake >= 1:1.7 BuildRequires: dotnet-gtk-sharp2-devel >= 2.9.0 BuildRequires: mono-csharp >= 1.1.13 -# for --enable-docs, which fails -#BuildRequires:mono-monodoc +# mono-nunit +%{?with_tests:BuildRequires: mono-devel} +%{?with_monodoc:BuildRequires: mono-monodoc} BuildRequires: pkgconfig BuildRequires: rpmbuild(macros) >= 1.311 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -49,17 +58,23 @@ Mono.Addins development files. Pliki programistyczne Mono.Addins. %prep -%setup -q +%setup -q -n %{name}-%{name}-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %{__aclocal} %{__automake} %{__autoconf} -%configure +%configure \ + %{?with_monodoc:--enable-docs} \ + %{?with_tests:--enable-tests} + %{__make} -j1 +%{?with_tests:%{__make} -C Test test} + %install rm -rf $RPM_BUILD_ROOT @@ -100,6 +115,11 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/mono/gac/policy.0.5.Mono.Addins.Gui %{_prefix}/lib/mono/gac/policy.0.5.Mono.Addins.MSBuild %{_prefix}/lib/mono/gac/policy.0.5.Mono.Addins.Setup +%{_prefix}/lib/mono/gac/policy.0.6.Mono.Addins +%{_prefix}/lib/mono/gac/policy.0.6.Mono.Addins.CecilReflector +%{_prefix}/lib/mono/gac/policy.0.6.Mono.Addins.Gui +%{_prefix}/lib/mono/gac/policy.0.6.Mono.Addins.MSBuild +%{_prefix}/lib/mono/gac/policy.0.6.Mono.Addins.Setup %{_mandir}/man1/mautil.1* %files devel @@ -109,7 +129,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/mono/mono-addins/Mono.Addins.Gui.dll %{_prefix}/lib/mono/mono-addins/Mono.Addins.MSBuild.dll %{_prefix}/lib/mono/mono-addins/Mono.Addins.Setup.dll -%{_prefix}/lib/mono/xbuild/Mono.Addins.targets +%if %{with monodoc} +%{_prefix}/lib/monodoc/sources/mono-addins-docs.* +%endif %{_pkgconfigdir}/mono-addins.pc %{_pkgconfigdir}/mono-addins-gui.pc %{_pkgconfigdir}/mono-addins-msbuild.pc diff --git a/mono-addins-automake.patch b/mono-addins-automake.patch deleted file mode 100644 index 0d0b5a3..000 --- a/mono-addins-automake.patch +++ /dev/null @@ -1,13 +0,0 @@ mono-addins-0.6.2/mautil/Makefile.am.pld 2012-03-20 17:40:53.865786609 +0100 -+++ mono-addins-0.6.2/mautil/Makefile.am 2012-03-20 17:41:02.635739097 +0100 -@@ -36,8 +36,8 @@ $(ASSEMBLY): $(build_sources) $(build_re - - include $(top_srcdir)/Makefile.include - --pkglibdir = $(prefix)/lib/mono/mono-addins --pkglib_SCRIPTS = $(ASSEMBLY) $(build_datafiles) -+pkgdatadir = $(prefix)/lib/mono/mono-addins -+pkgdata_SCRIPTS = $(ASSEMBLY) $(build_datafiles) - - man_MANS = mautil.1 - EXTRA_DIST += $(man_MANS) diff --git a/mono-addins-build.patch b/mono-addins-build.patch new file mode 100644 index 000..6cf0342 --- /dev/null +++ b/mono-addins-build.patch @@ -0,0 +1,12 @@ +Disable lower TargetFrameworkVersion forcing to avoi
[packages/python-ldaptor] - added fixes and updates from various github forks
commit 06f90a4b1226e1bd31208b9958932cf8da25299c Author: Jan Rękorajski Date: Tue Jan 7 21:33:35 2014 +0100 - added fixes and updates from various github forks abandon.patch | 133 deprecated-exception.patch | 36 ++ module-typo.patch | 25 +++ python-ldaptor.spec| 12 sasl.patch | 166 + starttls-fix.patch | 34 ++ unicode.patch | 84 +++ 7 files changed, 490 insertions(+) --- diff --git a/python-ldaptor.spec b/python-ldaptor.spec index 7f6a6dd..544b164 100644 --- a/python-ldaptor.spec +++ b/python-ldaptor.spec @@ -14,6 +14,12 @@ Source0: https://codeload.github.com/antong/ldaptor/tar.gz/%{githash}?/python-ld Source1: global.cfg Patch0:%{name}-remove-webui.patch Patch1:%{name}-doc-paths.patch +Patch2:deprecated-exception.patch +Patch3:module-typo.patch +Patch4:sasl.patch +Patch5:starttls-fix.patch +Patch6:unicode.patch +Patch7:abandon.patch URL: https://github.com/antong/ldaptor BuildRequires: python-distribute BuildRequires: rpm-pythonprov @@ -70,6 +76,12 @@ rm -rf ldaptor/test/web/ rm -f ldaptor/test/test_webui.* %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 %build %{__python} setup.py build diff --git a/abandon.patch b/abandon.patch new file mode 100644 index 000..d3c540d --- /dev/null +++ b/abandon.patch @@ -0,0 +1,133 @@ +From 549f3b2e81735b11aa8c8ce80736772ed9ee36a2 Mon Sep 17 00:00:00 2001 +From: Stefan Andersson +Date: Fri, 3 Feb 2012 11:41:26 +0100 +Subject: [PATCH] Add LDAPAbandonRequest Cherry picked + 893b8f9a1dbdb7229849a9bc506bb0fa46491a00 from norox. + +--- + ldaptor/protocols/pureldap.py | 32 ++-- + ldaptor/test/test_pureldap.py | 19 +++ + 2 files changed, 49 insertions(+), 2 deletions(-) + +diff --git a/ldaptor/protocols/pureldap.py b/ldaptor/protocols/pureldap.py +index 974293d..a332de1 100644 +--- a/ldaptor/protocols/pureldap.py b/ldaptor/protocols/pureldap.py +@@ -41,6 +41,9 @@ def escape(s): + s = s.replace('\0', r'\00') + return s + ++class LDAPInteger(BERInteger): ++pass ++ + class LDAPString(BEROctetString): + pass + +@@ -1121,9 +1124,33 @@ class LDAPModifyDNResponse(LDAPResult): + + #class LDAPCompareResponse(LDAPProtocolResponse): + #class LDAPCompareRequest(LDAPProtocolRequest): +-#class LDAPAbandonRequest(LDAPProtocolRequest): +-#needs_answer=0 + ++class LDAPAbandonRequest(LDAPProtocolRequest, LDAPInteger): ++tag = CLASS_APPLICATION|0x10 ++needs_answer=0 ++ ++def __init__(self, value=None, id=None, tag=None): ++""" ++Initialize the object ++ ++l=LDAPAbandonRequest(id=1) ++""" ++if id is None and value is not None: ++id = value ++LDAPProtocolRequest.__init__(self) ++LDAPInteger.__init__(self, value=id, tag=tag) ++ ++def __str__(self): ++return LDAPInteger.__str__(self) ++ ++def __repr__(self): ++if self.tag==self.__class__.tag: ++return self.__class__.__name__+"(id=%s)" \ ++ %repr(self.value) ++else: ++return self.__class__.__name__ \ ++ +"(id=%s, tag=%d)" \ ++ %(repr(self.value), self.tag) + + class LDAPOID(BEROctetString): + pass +@@ -1330,4 +1357,5 @@ class LDAPBERDecoderContext(BERDecoderContext): + LDAPExtendedResponse.tag: LDAPExtendedResponse, + LDAPModifyDNRequest.tag: LDAPModifyDNRequest, + LDAPModifyDNResponse.tag: LDAPModifyDNResponse, ++LDAPAbandonRequest.tag: LDAPAbandonRequest, + } +diff --git a/ldaptor/test/test_pureldap.py b/ldaptor/test/test_pureldap.py +index 16a6843..869485c 100644 +--- a/ldaptor/test/test_pureldap.py b/ldaptor/test/test_pureldap.py +@@ -546,6 +546,25 @@ class KnownValues(unittest.TestCase): + + l('foo')) + ), + ++(pureldap.LDAPExtendedRequest, ++ [], ++ {'requestName': '42.42.42', ++ 'requestValue': None, ++ }, ++ None, ++ [0x40|0x20|23, 1+1+8] ++ + ([0x80|0] +++ [len('42.42.42')] +++ l('42.42.42')) ++ ), ++ ++(pureldap.LDAPAbandonRequest, ++ [], ++ {'id': 3}, ++ None, ++ [0x40|0x10, 0x01, 3] ++ ), ++ + (pureldap.LDAPBindRequest, + [], + {'auth': ('PLAIN', 'test'), +-- +1.8.5.1 + +From 4d5656fc1fd2a7456357eb1e504e08f55c361aba Mon Sep 17 00:00:00 2001 +From: Stefan Andersson +Date: Mon, 30 Jan 2012 13:48:41 +0100 +Subject: [PATCH] requestValue is optional according to RFC 2251, make it so. + added unittest and changed assert +
[packages/gettext] - updated to 0.18.3.2 - removed obsolete format-security patch
commit 9f9ee3c797cec2d892beb7ccaae60e6d12997d09 Author: Jakub Bogusz Date: Tue Jan 7 21:33:05 2014 +0100 - updated to 0.18.3.2 - removed obsolete format-security patch format-security.patch | 31 --- gettext.spec | 11 +++ 2 files changed, 3 insertions(+), 39 deletions(-) --- diff --git a/gettext.spec b/gettext.spec index c3c4d2e..34d4696 100644 --- a/gettext.spec +++ b/gettext.spec @@ -39,17 +39,16 @@ Summary(ru.UTF-8): Библиотеки и утилиты для поддерж Summary(tr.UTF-8): Desteği için kitaplık ve araçlar Summary(uk.UTF-8): Бібліотеки та утиліти для підтримки національних мов Name: gettext -Version: 0.18.3.1 +Version: 0.18.3.2 Release: 1 License: LGPL v2+ (libintl), GPL v3+ (tools) Group: Development/Tools Source0: http://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz -# Source0-md5: 3fc808f7d25487fc72b5759df7419e02 +# Source0-md5: 241aba309d07aa428252c74b40a818ef Patch0:%{name}-info.patch Patch1:%{name}-killkillkill.patch Patch2:%{name}-pl.po-fixes.patch Patch3:%{name}-libintl_by_gcj.patch -Patch4:format-security.patch URL: http://www.gnu.org/software/gettext/ BuildRequires: acl-devel BuildRequires: autoconf >= 2.62 @@ -359,13 +358,8 @@ GNU gettext dla C#. %setup -q %patch0 -p1 %patch1 -p1 -#for d in gettext-runtime gettext-tools gettext-tools/examples ; do -# iconv -f iso-8859-2 -t utf-8 ${d}/po/pl.po > ${d}/po/pl.po.utf-8 -# mv -f ${d}/po/pl.po.utf-8 ${d}/po/pl.po -#done %patch2 -p1 %patch3 -p1 -%patch4 -p1 %build %{__libtoolize} @@ -482,6 +476,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/gettext/urlget %attr(755,root,root) %{_libdir}/gettext/user-email %{_aclocaldir}/codeset.m4 +%{_aclocaldir}/extern-inline.m4 %{_aclocaldir}/fcntl-o.m4 %{_aclocaldir}/gettext.m4 %{_aclocaldir}/glibc2.m4 diff --git a/format-security.patch b/format-security.patch deleted file mode 100644 index 27d7205..000 --- a/format-security.patch +++ /dev/null @@ -1,31 +0,0 @@ gettext-0.18.1.1/gettext-tools/libgrep/m-regex.c~ 2010-06-06 14:49:57.0 +0200 -+++ gettext-0.18.1.1/gettext-tools/libgrep/m-regex.c 2012-12-12 13:19:17.540818961 +0100 -@@ -106,7 +106,7 @@ - - if ((err = re_compile_pattern (motif, len, - &cregex->patterns[cregex->pcount].regexbuf)) != NULL) -- error (exit_failure, 0, err); -+ error (exit_failure, 0, "%s", err); - cregex->pcount++; - - motif = sep; gettext-0.18.1.1/gettext-tools/libgrep/m-fgrep.c~ 2010-06-06 14:49:57.0 +0200 -+++ gettext-0.18.1.1/gettext-tools/libgrep/m-fgrep.c 2012-12-12 13:19:46.297484613 +0100 -@@ -106,7 +106,7 @@ - for (lim = beg; lim < pattern + pattern_size && *lim != '\n'; ++lim) - ; - if ((err = kwsincr (ckwset->kwset, beg, lim - beg)) != NULL) --error (exit_failure, 0, err); -+error (exit_failure, 0, "%s", err); - if (lim < pattern + pattern_size) - ++lim; - beg = lim; -@@ -114,7 +114,7 @@ - while (beg < pattern + pattern_size); - - if ((err = kwsprep (ckwset->kwset)) != NULL) --error (exit_failure, 0, err); -+error (exit_failure, 0, "%s", err); - return ckwset; - } - gitweb: http://git.pld-linux.org/gitweb.cgi/packages/gettext.git/commitdiff/9f9ee3c797cec2d892beb7ccaae60e6d12997d09 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: gettext: gettext-0.18.3.2.tar.gz
Files fetched: 1 STORED: http://ftp.gnu.org/gnu/gettext/gettext-0.18.3.2.tar.gz 241aba309d07aa428252c74b40a818ef gettext-0.18.3.2.tar.gz Size: 16189249 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-ldaptor] - Requires cleanup
commit 547945a38e680433499aaf784a706a51269e3ff6 Author: Jan Rękorajski Date: Tue Jan 7 21:15:49 2014 +0100 - Requires cleanup python-ldaptor.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/python-ldaptor.spec b/python-ldaptor.spec index 978d441..7f6a6dd 100644 --- a/python-ldaptor.spec +++ b/python-ldaptor.spec @@ -27,12 +27,12 @@ BuildRequires: libxslt BuildRequires: python-docutils BuildRequires: source-highlight %endif +Requires: Zope-Interface Requires: python-modules +Requires: python-pyparsing Requires: python-TwistedCore +Requires: python-TwistedMail Requires: python-TwistedNames -Requires: python-pyparsing -Requires: python-twisted-mail -Requires: python-zope-interface BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/python-ldaptor.git/commitdiff/547945a38e680433499aaf784a706a51269e3ff6 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: hhvm: HHVM-2.3.2.tar.gz libevent-1.4.14b-stable.tar.gz folly-0.1-311c98e.tar.gz
Files fetched: 1 ALREADY GOT: https://github.com/facebook/hhvm/archive/HHVM-2.3.2.tar.gz 471961d38ba52c66b7038c556b2b7bd8 HHVM-2.3.2.tar.gz ALREADY GOT: http://www.monkey.org/~provos/libevent-1.4.14b-stable.tar.gz a00e037e4d3f9e4fe9893e8a2d27918c libevent-1.4.14b-stable.tar.gz STORED: https://github.com/facebook/folly/archive/311c98e/folly-0.1-311c98e.tar.gz 338c206bccfa1a19eeb45396cd6adac6 folly-0.1-311c98e.tar.gz Size: 716724 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/hhvm] update folly to 311c98e; upstream fixes
commit 349ae08495b7e692e040823e538d1f445ee52a6d Author: Elan Ruusamäe Date: Tue Jan 7 22:08:23 2014 +0200 update folly to 311c98e; upstream fixes checksum.patch | 10 +- hhvm.spec | 12 +--- 2 files changed, 10 insertions(+), 12 deletions(-) --- diff --git a/hhvm.spec b/hhvm.spec index ecd58a2..93953e6 100644 --- a/hhvm.spec +++ b/hhvm.spec @@ -7,7 +7,7 @@ Summary: Virtual Machine, Runtime, and JIT for PHP Name: hhvm Version: 2.3.2 -Release: 0.21 +Release: 0.22 License: PHP 3.01 Group: Development/Languages Source0: https://github.com/facebook/hhvm/archive/HHVM-%{version}.tar.gz @@ -15,8 +15,8 @@ Source0: https://github.com/facebook/hhvm/archive/HHVM-%{version}.tar.gz # need fb.changes.patch, which is available for 1.4 only Source1: http://www.monkey.org/~provos/libevent-1.4.14b-stable.tar.gz # Source1-md5: a00e037e4d3f9e4fe9893e8a2d27918c -Source2: https://github.com/facebook/folly/archive/4d6d659/folly-0.1-4d6d659.tar.gz -# Source2-md5: 2e7c941f737c8e0a449b8116e7615656 +Source2: https://github.com/facebook/folly/archive/311c98e/folly-0.1-311c98e.tar.gz +# Source2-md5: 338c206bccfa1a19eeb45396cd6adac6 Source3: %{name}-fcgi.init Source4: %{name}-fcgi.sysconfig Source100: get-source.sh @@ -185,8 +185,6 @@ C++. %setup -q -a1 -a2 -n %{name}-HHVM-%{version} mv folly-*/* hphp/submodules/folly -# https://github.com/facebook/folly/pull/44 -sed -i -e '21 d' hphp/third_party/folly/folly/detail/Malloc.h %patch6 -p1 %patch7 -p1 @@ -267,7 +265,7 @@ export HHVM_REPO_SCHEMA=$(date +%N_%s) %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc/%{name} +install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name} %{__make} install \ HPHP_HOME=$(pwd) \ DESTDIR=$RPM_BUILD_ROOT @@ -343,7 +341,7 @@ fi %files %defattr(644,root,root,755) %doc README.md hphp/NEWS -%dir /etc/%{name} +%dir %{_sysconfdir}/%{name} %attr(755,root,root) %{_bindir}/hhvm %attr(755,root,root) %{_bindir}/hphp %attr(755,root,root) %{_libdir}/libevent-1.4.so.*.*.* diff --git a/checksum.patch b/checksum.patch index 1ef4df3..8a41f8e 100644 --- a/checksum.patch +++ b/checksum.patch @@ -11,14 +11,14 @@ HHVM-2.3.2/hphp/third_party/folly/folly/Checksum.cpp:57:61: error: ‘__builtin_ sum = (uint32_t)__builtin_ia32_crc32qi(sum, data[offset]); hhvm-HHVM-2.3.2/hphp/third_party/folly/folly/Checksum.cpp~ 2014-01-01 23:57:39.0 +0200 -+++ hhvm-HHVM-2.3.2/hphp/third_party/folly/folly/Checksum.cpp 2014-01-01 23:57:45.449293562 +0200 +--- hhvm-HHVM-2.3.2/hphp/third_party/folly/folly/Checksum.cpp~ 2014-01-06 21:39:35.0 +0200 hhvm-HHVM-2.3.2/hphp/third_party/folly/folly/Checksum.cpp 2014-01-07 19:12:23.829367686 +0200 @@ -25,7 +25,7 @@ - namespace detail { --#if defined(__x86_64__) && defined (__GNUC__) -+#if defined(__x86_64__) && defined (__GNUC__) && 0 + #if defined(__x86_64__) && defined(__GNUC__) && defined(__GNUC_MINOR__) && \ +-(((__GNUC__ * 100) + __GNUC_MINOR__) >= 408) ++(((__GNUC__ * 100) + __GNUC_MINOR__) >= 408) && 0 // Fast SIMD implementation of CRC-32C for x86 with SSE 4.2 uint32_t crc32c_hw(const uint8_t *data, size_t nbytes, gitweb: http://git.pld-linux.org/gitweb.cgi/packages/hhvm.git/commitdiff/349ae08495b7e692e040823e538d1f445ee52a6d ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-ldaptor] - added doc bcond - cleaned up install - updated BRs
commit bf35693986be55bc6a318f50c3e570730d8bb8a2 Author: Jan Rękorajski Date: Tue Jan 7 20:59:49 2014 +0100 - added doc bcond - cleaned up install - updated BRs python-ldaptor.spec | 60 +++-- 1 file changed, 26 insertions(+), 34 deletions(-) --- diff --git a/python-ldaptor.spec b/python-ldaptor.spec index ba5b1c1..978d441 100644 --- a/python-ldaptor.spec +++ b/python-ldaptor.spec @@ -1,5 +1,8 @@ +# +# Conditional build: +%bcond_withdoc # build the documentation +# %definegithash 29a06fa - Summary: Python LDAP client library Name: python-ldaptor Version: 0.0.44 @@ -12,7 +15,10 @@ Source1: global.cfg Patch0:%{name}-remove-webui.patch Patch1:%{name}-doc-paths.patch URL: https://github.com/antong/ldaptor -BuildRequires: python-devel +BuildRequires: python-distribute +BuildRequires: rpm-pythonprov +BuildRequires: rpmbuild(macros) >= 1.219 +%if %{with doc} BuildRequires: dia BuildRequires: docbook-slides BuildRequires: docbook-style-xsl @@ -20,6 +26,8 @@ BuildRequires:epydoc BuildRequires: libxslt BuildRequires: python-docutils BuildRequires: source-highlight +%endif +Requires: python-modules Requires: python-TwistedCore Requires: python-TwistedNames Requires: python-pyparsing @@ -64,60 +72,44 @@ rm -f ldaptor/test/test_webui.* %patch1 -p1 %build -%{__make} -C doc +%{__python} setup.py build +%if %{with doc} +%{__make} -C doc epydoc -o doc/api --name Ldaptor ldaptor --exclude 'ldaptor\.test\.' --simple-term +%endif %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_sysconfdir}/ldaptor %{__python} setup.py install \ --root $RPM_BUILD_ROOT -# library system-wide configuration -install -d $RPM_BUILD_ROOT%{_sysconfdir}/ldaptor -install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/ldaptor/ - -# shared data -install -d $RPM_BUILD_ROOT%{_datadir}/%{name} -install ldaptor.schema $RPM_BUILD_ROOT%{_datadir}/%{name}/ - -# fix permissions on executable files in the library -chmod a+x $RPM_BUILD_ROOT%{py_sitescriptdir}/ldaptor/ldapfilter.py - -# install documentation -install -d $RPM_BUILD_ROOT%{_docdir} -install -d $RPM_BUILD_ROOT%{_pkgdocdir} -for docdir in addressbook-slides api examples ldap-intro; do - cp -r doc/$docdir $RPM_BUILD_ROOT%{_pkgdocdir}/ -done - -# make *.py files in documentation not executable, rename to avoid byte-compilation -mv $RPM_BUILD_ROOT%{_pkgdocdir}/examples/ldif2ldif{,.py} -for pyfile in $(find $RPM_BUILD_ROOT%{_pkgdocdir}/examples -name "*.py"); do - chmod a-x $pyfile - mv $pyfile $pyfile.example -done +# library system-wide configuration and schema +install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/ldaptor +install -p ldaptor.schema $RPM_BUILD_ROOT%{_sysconfdir}/ldaptor %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc COPYING TODO README.md -%exclude %{_pkgdocdir}/*/ +%doc TODO README.md %dir %{_sysconfdir}/ldaptor %config(noreplace) %{_sysconfdir}/ldaptor/global.cfg -%{_datadir}/%{name}/ +%{_sysconfdir}/ldaptor/ldaptor.schema %{py_sitescriptdir}/ldaptor-0.0.0-py2.7.egg-info %{py_sitescriptdir}/ldaptor +%if %{with doc} %files doc %defattr(644,root,root,755) -%doc %{_pkgdocdir}/addressbook-slides/ -%doc %{_pkgdocdir}/api/ -%doc %{_pkgdocdir}/examples/ -%doc %{_pkgdocdir}/ldap-intro/ +%doc doc/addressbook-slides/ +%doc doc/api/ +%doc doc/examples/ +%doc doc/ldap-intro/ +%endif %files tools %defattr(644,root,root,755) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/python-ldaptor.git/commitdiff/bf35693986be55bc6a318f50c3e570730d8bb8a2 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/setedit] - added format-security.patch - rel 3
commit 11cebe08cc66ac1a680e03068ce36f0718e5eb0b Author: Witold Filipczyk Date: Tue Jan 7 20:47:24 2014 +0100 - added format-security.patch - rel 3 setedit.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/setedit.spec b/setedit.spec index 11eda31..5abc2ab 100644 --- a/setedit.spec +++ b/setedit.spec @@ -4,13 +4,14 @@ Summary: User friendly text editor Summary(pl.UTF-8): Przyjazny edytor tekstu Name: setedit Version: 0.5.7 -Release: 2 +Release: 3 License: GPL Group: Applications/Editors Source0: http://download.sourceforge.net/setedit/%{name}_%{version}-2.tar.gz # Source0-md5: 99dfde9ebfce5d47aebf71fde3f5cf5f Patch0:%{name}-pcre_fullinfo.patch Patch1:doc_ii.patch +Patch2:format-security.patch URL: http://setedit.sourceforge.net/ BuildRequires: aalib-devel BuildRequires: bzip2-devel >= 0.9.5d @@ -27,8 +28,6 @@ BuildRequires:texinfo BuildRequires: zlib-devel >= 1.1.4 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define Werror_cflags -Wformat - %description Setedit is text editor, which uses Turbo Vision (menus, windows like in many DOS applications). It has some interesting features (MP3 @@ -65,6 +64,7 @@ Pliki biblioteczne setedit. %setup -q -n %{name} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build rm -f Makefile gitweb: http://git.pld-linux.org/gitweb.cgi/packages/setedit.git/commitdiff/11cebe08cc66ac1a680e03068ce36f0718e5eb0b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/setedit] - compilation fix
commit dc4a51baf921f41216263e0fb1fddc92e28991dd Author: Witold Filipczyk Date: Tue Jan 7 20:46:56 2014 +0100 - compilation fix format-security.patch | 98 +++ 1 file changed, 98 insertions(+) --- diff --git a/format-security.patch b/format-security.patch new file mode 100644 index 000..d0f3028 --- /dev/null +++ b/format-security.patch @@ -0,0 +1,98 @@ +--- setedit/infview/infmain.cc.orig2014-01-07 20:23:16.177547964 +0100 setedit/infview/infmain.cc 2014-01-07 20:28:16.422191144 +0100 +@@ -659,34 +659,34 @@ void ParseCommandLine(int argc, char *ar +case 'h': +default: + TScreen::suspend(); +-fprintf(stderr,_("InfView v"INFVIEW_VERSION_STR". Copyright (c) 1996-2002 by Salvador E. Tropea\n\n")); +-fprintf(stderr,_("infview [option]... [info_file [menu_item...]]\n\n")); +-fprintf(stderr,_("Valid options are:\n")); +-fprintf(stderr,_("-d, --directory DIR adds a directory to the list of directories to search\n" +- " (DIR to INFOPATH)\n")); +-fprintf(stderr,_("-f, --file FILENAME load FILENAME info file.\n")); ++fputs(_("InfView v"INFVIEW_VERSION_STR". Copyright (c) 1996-2002 by Salvador E. Tropea\n\n"), stderr); ++fputs(_("infview [option]... [info_file [menu_item...]]\n\n"), stderr); ++fputs(_("Valid options are:\n"), stderr); ++fputs(_("-d, --directory DIR adds a directory to the list of directories to search\n" ++ " (DIR to INFOPATH)\n"), stderr); ++fputs(_("-f, --file FILENAME load FILENAME info file.\n"), stderr); + #ifdef TVCompf_djgpp // Don't name it under Linux +-fprintf(stderr,_("-l, --force-no-lfn avoids the use of long file names under W9x.\n")); +-fprintf(stderr,_("-L, --force-lfn forces the use of long file names under W9x.\n")); ++fputs(_("-l, --force-no-lfn avoids the use of long file names under W9x.\n"), stderr); ++fputs(_("-L, --force-lfn forces the use of long file names under W9x.\n"), stderr); + #else +-fprintf(stderr,_("-k, --use-rh-52-keys enables the Red Hat 5.2 style keyboard mapping.\n")); ++fputs(_("-k, --use-rh-52-keys enables the Red Hat 5.2 style keyboard mapping.\n"), stderr); + #endif +-fprintf(stderr,_("-n, --node NODE jumps to this node.\n")); +-fprintf(stderr,_("-r, --read-dkt FILENAME if no file is opened use this desktop file.\n")); +-fprintf(stderr,_("-s, --save-dkt FILENAME save the desktop to this file at exit.\n")); +-fprintf(stderr,_("-h, --help displays this text ;-).\n\n")); +-fprintf(stderr,_("The first argument, if present, is the name of the Info file to read.\n" +- "Any remaining arguments are treated as the names of menu items in the initial\n")); ++fputs(_("-n, --node NODE jumps to this node.\n"), stderr); ++fputs(_("-r, --read-dkt FILENAME if no file is opened use this desktop file.\n"), stderr); ++fputs(_("-s, --save-dkt FILENAME save the desktop to this file at exit.\n"), stderr); ++fputs(_("-h, --help displays this text ;-).\n\n"), stderr); ++fputs(_("The first argument, if present, is the name of the Info file to read.\n" ++ "Any remaining arguments are treated as the names of menu items in the initial\n"), stderr); + #ifdef TVOSf_Linux +-fprintf(stderr,_("node visited. For example, `infview libc \"function index\" printf' moves to the\n" +- "node `Function Index' and then to `printf' in the info file `libc'.\n\n")); ++fputs(_("node visited. For example, `infview libc \"function index\" printf' moves to the\n" ++ "node `Function Index' and then to `printf' in the info file `libc'.\n\n"), stderr); + #else +-fprintf(stderr,_("node visited. For example, `infview libc alpha printf' moves to the node\n" +- "`Alphabetical list' and then to `printf' in the info file `libc'.\n\n")); ++fputs(_("node visited. For example, `infview libc alpha printf' moves to the node\n" ++ "`Alphabetical list' and then to `printf' in the info file `libc'.\n\n"), stderr); + #endif +-fprintf(stderr,_("Also note that info files are searched in the INFOPATH directories. To load a\n" ++fputs(_("Also note that info files are searched in the INFOPATH directories. To load a\n" + "file stored in the current
[packages/libcap] - removed obsolete sys/capability.h fix
commit 7115d864d5a8cbe0623b4ffe301e513745e8 Author: Jakub Bogusz Date: Tue Jan 7 20:38:11 2014 +0100 - removed obsolete sys/capability.h fix libcap.spec | 4 1 file changed, 4 deletions(-) --- diff --git a/libcap.spec b/libcap.spec index 2b68b91..9cf06a3 100644 --- a/libcap.spec +++ b/libcap.spec @@ -14,7 +14,6 @@ URL: https://sites.google.com/site/fullycapable/ BuildRequires: attr-devel BuildRequires: pam-devel BuildRequires: perl-base -BuildRequires: sed >= 4.0 BuildRequires: tar >= 1:1.22 BuildRequires: xz Requires: %{name}-libs = %{epoch}:%{version}-%{release} @@ -119,9 +118,6 @@ ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libcap.so.*.*) \ chmod a+x $RPM_BUILD_ROOT/%{_lib}/*.so* -# fix include -%{__sed} -i -e 's,uapi/linux/capability,linux/capability,' $RPM_BUILD_ROOT%{_includedir}/sys/capability.h - %clean rm -rf $RPM_BUILD_ROOT gitweb: http://git.pld-linux.org/gitweb.cgi/packages/libcap.git/commitdiff/7115d864d5a8cbe0623b4ffe301e513745e8 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/setedit] - added doc_ii.patch - BR: libmigdb - rel 2
commit 55ff3e99f32278b9b6481912826726b0be52ed68 Author: Witold Filipczyk Date: Tue Jan 7 20:10:56 2014 +0100 - added doc_ii.patch - BR: libmigdb - rel 2 setedit.spec | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) --- diff --git a/setedit.spec b/setedit.spec index a3faecf..11eda31 100644 --- a/setedit.spec +++ b/setedit.spec @@ -4,26 +4,31 @@ Summary: User friendly text editor Summary(pl.UTF-8): Przyjazny edytor tekstu Name: setedit Version: 0.5.7 -Release: 0.2 +Release: 2 License: GPL Group: Applications/Editors Source0: http://download.sourceforge.net/setedit/%{name}_%{version}-2.tar.gz # Source0-md5: 99dfde9ebfce5d47aebf71fde3f5cf5f Patch0:%{name}-pcre_fullinfo.patch +Patch1:doc_ii.patch URL: http://setedit.sourceforge.net/ BuildRequires: aalib-devel BuildRequires: bzip2-devel >= 0.9.5d BuildRequires: gettext-devel BuildRequires: gpm-devel >= 1.10 +BuildRequires: libmigdb BuildRequires: librhtv-devel >= 2.2.1 BuildRequires: libstdc++-devel BuildRequires: ncurses-devel BuildRequires: pcre-devel BuildRequires: perl-base BuildRequires: recode +BuildRequires: texinfo BuildRequires: zlib-devel >= 1.1.4 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define Werror_cflags -Wformat + %description Setedit is text editor, which uses Turbo Vision (menus, windows like in many DOS applications). It has some interesting features (MP3 @@ -59,6 +64,7 @@ Pliki biblioteczne setedit. %prep %setup -q -n %{name} %patch0 -p1 +%patch1 -p1 %build rm -f Makefile gitweb: http://git.pld-linux.org/gitweb.cgi/packages/setedit.git/commitdiff/55ff3e99f32278b9b6481912826726b0be52ed68 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/setedit] - ii macro was undefined.
commit 589ae4d66eae82d4e0f2b59f96f0fe85a477651a Author: Witold Filipczyk Date: Tue Jan 7 20:10:24 2014 +0100 - ii macro was undefined. doc_ii.patch | 11 +++ 1 file changed, 11 insertions(+) --- diff --git a/doc_ii.patch b/doc_ii.patch new file mode 100644 index 000..dcd18e6 --- /dev/null +++ b/doc_ii.patch @@ -0,0 +1,11 @@ +--- setedit/doc/set.txi.orig 2014-01-07 20:01:24.770600658 +0100 setedit/doc/set.txi2014-01-07 20:01:57.387771796 +0100 +@@ -187,7 +187,7 @@ + @subtitle @value{update-month} + + @author by @value{name-author} +-@author @ii{last updated @value{update-date}} ++@author last updated @value{update-date} + + @page + gitweb: http://git.pld-linux.org/gitweb.cgi/packages/setedit.git/commitdiff/55ff3e99f32278b9b6481912826726b0be52ed68 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: python-ldaptor: python-ldaptor-0.0.44.29a06fa.tar.gz
Files fetched: 1 STORED: https://codeload.github.com/antong/ldaptor/tar.gz/29a06fa?/python-ldaptor-0.0.44.29a06fa.tar.gz eace8cf1dc3f7061051b019444d57ca6 python-ldaptor-0.0.44.29a06fa.tar.gz Size: 235683 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-ldaptor] - don't use global
commit d0b2ae9e868578b35271a2072e78f278394f7e1f Author: Jan Rękorajski Date: Tue Jan 7 20:05:44 2014 +0100 - don't use global python-ldaptor.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/python-ldaptor.spec b/python-ldaptor.spec index 44a6e4c..ba5b1c1 100644 --- a/python-ldaptor.spec +++ b/python-ldaptor.spec @@ -1,4 +1,4 @@ -%globalgithash 29a06fa +%definegithash 29a06fa Summary: Python LDAP client library Name: python-ldaptor gitweb: http://git.pld-linux.org/gitweb.cgi/packages/python-ldaptor.git/commitdiff/d0b2ae9e868578b35271a2072e78f278394f7e1f ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: libmigdb: ERRORS: libmigdb-0.8.12.tar.bz2
wget -nv --no-check-certificate --user-agent=PLD/distfiles -O ./tmp/f834a872-6edb-42a0-bc40-c951b53768ab/2dfbc888adef6dff28f52d3c44b86962/libmigdb-0.8.12.tar.bz2 http://dl.sourceforge.net/libmigdb/libmigdb-0.8.12.tar.bz2: exited with code 4 (0x00) FATAL: http://dl.sourceforge.net/libmigdb/libmigdb-0.8.12.tar.bz2 (2dfbc888adef6dff28f52d3c44b86962) was not fetched correctly (wget -nv --no-check-certificate --user-agent=PLD/distfiles -O ./tmp/f834a872-6edb-42a0-bc40-c951b53768ab/2dfbc888adef6dff28f52d3c44b86962/libmigdb-0.8.12.tar.bz2 http://dl.sourceforge.net/libmigdb/libmigdb-0.8.12.tar.bz2: ): file fetched but has 0 length Files fetched: 0 -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/libmigdb] - up to 0.8.12
commit e1d7bb8f1a21abb93751fd2e296fd3a679086817 Author: Witold Filipczyk Date: Tue Jan 7 19:51:53 2014 +0100 - up to 0.8.12 libmigdb.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/libmigdb.spec b/libmigdb.spec index ce80b34..0c4184d 100644 --- a/libmigdb.spec +++ b/libmigdb.spec @@ -1,12 +1,12 @@ Summary: Library handling GDB/MI interface Summary(pl.UTF-8): Biblioteka obsługująca interfejs GDB/MI Name: libmigdb -Version: 0.8.11 +Version: 0.8.12 Release: 1 License: GPL v2 Group: Development/Libraries Source0: http://dl.sourceforge.net/libmigdb/%{name}-%{version}.tar.bz2 -# Source0-md5: 436484fe32f552f28ac06f16828c21b8 +# Source0-md5: 2dfbc888adef6dff28f52d3c44b86962 URL: http://sourceforge.net/projects/libmigdb/ BuildRequires: libstdc++-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/libmigdb.git/commitdiff/e1d7bb8f1a21abb93751fd2e296fd3a679086817 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: python-ldaptor: ERRORS:
python-ldaptor: undefined macro githash Files fetched: 0 -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-ldaptor] - new, adapterized import from fedora
commit 23c5a3f75f91486d28137d046a317034aead7a77 Author: Jan Rękorajski Date: Tue Jan 7 19:49:05 2014 +0100 - new, adapterized import from fedora global.cfg| 6 ++ python-ldaptor-doc-paths.patch| 52 +++ python-ldaptor-remove-webui.patch | 190 ++ python-ldaptor.spec | 124 + 4 files changed, 372 insertions(+) --- diff --git a/python-ldaptor.spec b/python-ldaptor.spec new file mode 100644 index 000..44a6e4c --- /dev/null +++ b/python-ldaptor.spec @@ -0,0 +1,124 @@ +%globalgithash 29a06fa + +Summary: Python LDAP client library +Name: python-ldaptor +Version: 0.0.44 +Release: 0.git%{githash}.0.1 +License: LGPLv2 +Group: Libraries/Python +Source0: https://codeload.github.com/antong/ldaptor/tar.gz/%{githash}?/python-ldaptor-%{version}.%{githash}.tar.gz +# Source0-md5: eace8cf1dc3f7061051b019444d57ca6 +Source1: global.cfg +Patch0:%{name}-remove-webui.patch +Patch1:%{name}-doc-paths.patch +URL: https://github.com/antong/ldaptor +BuildRequires: python-devel +BuildRequires: dia +BuildRequires: docbook-slides +BuildRequires: docbook-style-xsl +BuildRequires: epydoc +BuildRequires: libxslt +BuildRequires: python-docutils +BuildRequires: source-highlight +Requires: python-TwistedCore +Requires: python-TwistedNames +Requires: python-pyparsing +Requires: python-twisted-mail +Requires: python-zope-interface +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Ldaptor is LDAP library written in pure Python. The library implements +LDAP client logic, separately-accessible LDAP and BER protocol message +generation and parsing, ASCII format LDAP filter generation and +parsing, LDIF format data generation, and Samba password changing +logic. + +%package doc +Summary: Documentation for python-ldaptor package +Group: Libraries/Python +Requires: %{name} = %{version}-%{release} + +%description doc +The package contains documentation for python-ldaptor package. + +%package tools +Summary: Ldaptor command line utilities +Group: Libraries/Python +Requires: %{name} = %{version}-%{release} + +%description tools +The package contains command line utilities build upon python-ldaptor +library. + + +%prep +%setup -q -n ldaptor-%{githash} +# remove deprecated web interface +rm -rf ldaptor/apps +rm -rf ldaptor/weave.* +rm -rf ldaptor/test/web/ +rm -f ldaptor/test/test_webui.* +%patch0 -p1 +%patch1 -p1 + +%build +%{__make} -C doc + +epydoc -o doc/api --name Ldaptor ldaptor --exclude 'ldaptor\.test\.' --simple-term + +%install +rm -rf $RPM_BUILD_ROOT + +%{__python} setup.py install \ + --root $RPM_BUILD_ROOT + +# library system-wide configuration +install -d $RPM_BUILD_ROOT%{_sysconfdir}/ldaptor +install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/ldaptor/ + +# shared data +install -d $RPM_BUILD_ROOT%{_datadir}/%{name} +install ldaptor.schema $RPM_BUILD_ROOT%{_datadir}/%{name}/ + +# fix permissions on executable files in the library +chmod a+x $RPM_BUILD_ROOT%{py_sitescriptdir}/ldaptor/ldapfilter.py + +# install documentation +install -d $RPM_BUILD_ROOT%{_docdir} +install -d $RPM_BUILD_ROOT%{_pkgdocdir} +for docdir in addressbook-slides api examples ldap-intro; do + cp -r doc/$docdir $RPM_BUILD_ROOT%{_pkgdocdir}/ +done + +# make *.py files in documentation not executable, rename to avoid byte-compilation +mv $RPM_BUILD_ROOT%{_pkgdocdir}/examples/ldif2ldif{,.py} +for pyfile in $(find $RPM_BUILD_ROOT%{_pkgdocdir}/examples -name "*.py"); do + chmod a-x $pyfile + mv $pyfile $pyfile.example +done + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc COPYING TODO README.md +%exclude %{_pkgdocdir}/*/ +%dir %{_sysconfdir}/ldaptor +%config(noreplace) %{_sysconfdir}/ldaptor/global.cfg +%{_datadir}/%{name}/ +%{py_sitescriptdir}/ldaptor-0.0.0-py2.7.egg-info +%{py_sitescriptdir}/ldaptor + +%files doc +%defattr(644,root,root,755) +%doc %{_pkgdocdir}/addressbook-slides/ +%doc %{_pkgdocdir}/api/ +%doc %{_pkgdocdir}/examples/ +%doc %{_pkgdocdir}/ldap-intro/ + +%files tools +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/ldaptor-* diff --git a/global.cfg b/global.cfg new file mode 100644 index 000..90dee1c --- /dev/null +++ b/global.cfg @@ -0,0 +1,6 @@ +# +# This is the global configuration file for the python-ldaptor library +# User specific options can be placed in ~/.ldaptor/global.cfg +# +# example: /usr/share/doc/python-ldaptor-*/examples/global.cfg +# diff --git a/python-ldaptor-doc-paths.patch b/python-ldaptor-doc-paths.patch new file mode 100644 index 000..38c8e98 --- /dev/null +++ b/python-ldaptor-doc-paths.patch @@ -0,0 +1,52 @@ +Update paths in documentation source files for compilation on newest Fedora. + +Author: Jan Vcelak +
[packages/python-ldaptor] Created branch master
The branch 'master' was created. Summary of new commits: 23c5a3f... - new, adapterized import from fedora ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/librhtv] - compilation fix
commit 6735d0c4272d79eaf746393972193605142fc9b4 Author: Witold Filipczyk Date: Tue Jan 7 19:44:42 2014 +0100 - compilation fix format-security.patch | 11 +++ 1 file changed, 11 insertions(+) --- diff --git a/format-security.patch b/format-security.patch new file mode 100644 index 000..b602a9a --- /dev/null +++ b/format-security.patch @@ -0,0 +1,11 @@ +--- tvision/classes/tlookupv.cc.orig 2014-01-07 17:22:42.816679628 +0100 tvision/classes/tlookupv.cc2014-01-07 17:32:22.022303566 +0100 +@@ -57,7 +57,7 @@ const char * TStringLookupValidator::err + + void TStringLookupValidator::error() + { +- messageBox(mfError | mfOKButton, errorMsg); ++ messageBox(errorMsg, mfError | mfOKButton ); + } + + static Boolean stringMatch(void* a1, void* a2) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/librhtv.git/commitdiff/f0c034a2363da0ffa39011b7dbdb4a24b417071b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/librhtv] - added format-security.patch - ghost symlink - pass rpmldflags - rel 1
commit f0c034a2363da0ffa39011b7dbdb4a24b417071b Author: Witold Filipczyk Date: Tue Jan 7 19:45:14 2014 +0100 - added format-security.patch - ghost symlink - pass rpmldflags - rel 1 librhtv.spec | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) --- diff --git a/librhtv.spec b/librhtv.spec index 5306577..ef9c29f 100644 --- a/librhtv.spec +++ b/librhtv.spec @@ -2,7 +2,7 @@ Summary:Unix port of Borland TurboVision library Summary(pl.UTF-8): Uniksowa wersja biblioteki TurboVision Borlanda Name: librhtv Version: 2.2.1 -Release: 0.1 +Release: 1 License: Borland, some modifications are BSD-like licensed (generally free) Group: Libraries Source0: http://download.sourceforge.net/tvision/rhtvision_%{version}-1.tar.gz @@ -10,6 +10,7 @@ Source0: http://download.sourceforge.net/tvision/rhtvision_%{version}-1.tar.gz Patch0:%{name}-nolowlevelgarbage.patch Patch1:%{name}-fcntl.patch Patch2:%{name}-ncurses.patch +Patch3:format-security.patch URL: http://tvision.sourceforge.net/ BuildRequires: xorg-lib-libX11-devel BuildRequires: gpm-devel @@ -64,18 +65,20 @@ Biblioteki statyczne rhtvision. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %{__perl} config.pl \ --prefix=%{_prefix} \ --cflags="%{rpmcflags} -I/usr/include/ncursesw" \ --cxxflags="%{rpmcflags} -fno-exceptions -I/usr/include/ncursesw" \ - --X11lib="tinfow X11 Xmu" \ + --X11lib="X11 Xmu" \ %{?debug:--with-debug} %{__make} \ RHIDE_GCC="%{__cc}" \ RHIDE_GXX="%{__cxx}" \ + RHIDE_LDFLAGS="%{rpmldflags} -shared -Wl,-soname,librhtv.so.2" \ libdir=%{_libdir} %install @@ -86,6 +89,10 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} prefix=$RPM_BUILD_ROOT%{_prefix} \ libdir=$RPM_BUILD_ROOT%{_libdir} +cd $RPM_BUILD_ROOT%{_libdir} +ln -sf librhtv.so.2.2.1 librhtv.so.2 +cd - + # let's create new rhide.env cat > examples/rhide.env
DISTFILES: nss: nss-3.15.4.tar.gz root.der
Files fetched: 1 STORED: http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_4_RTM/src/nss-3.15.4.tar.gz 74738d89615665e3547dc2c0602ab0e6 nss-3.15.4.tar.gz Size: 6366271 bytes ALREADY GOT: http://www.cacert.org/certs/root.der a61b375e390d9c3654eebd2031461f6b root.der -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/nss] - up to 3.15.4
commit f6a049648914a2a2686efd05d54aca71b3132806 Author: Jan Palus Date: Tue Jan 7 19:33:32 2014 +0100 - up to 3.15.4 nss.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/nss.spec b/nss.spec index ae8e423..e934bf1 100644 --- a/nss.spec +++ b/nss.spec @@ -2,13 +2,13 @@ Summary: NSS - Network Security Services Summary(pl.UTF-8): NSS - Network Security Services Name: nss -Version: 3.15.3.1 +Version: 3.15.4 Release: 1 Epoch: 1 License: MPL v1.1 or GPL v2+ or LGPL v2.1+ Group: Libraries Source0: http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_%{foover}_RTM/src/%{name}-%{version}.tar.gz -# Source0-md5: 1d444fffdb1f890a03b50295b5aa +# Source0-md5: 74738d89615665e3547dc2c0602ab0e6 Source1: %{name}-mozilla-nss.pc Source2: %{name}-config.in Source3: http://www.cacert.org/certs/root.der gitweb: http://git.pld-linux.org/gitweb.cgi/packages/nss.git/commitdiff/f6a049648914a2a2686efd05d54aca71b3132806 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: mpv: mpv-0.3.2.tar.gz
Files fetched: 1 STORED: http://github.com/mpv-player/mpv/archive/v0.3.2.tar.gz?/mpv-0.3.2.tar.gz 516f2eeec1d1f69905d11c1feec8166e mpv-0.3.2.tar.gz Size: 2513998 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/mpv] Created branch master
The branch 'master' was created. Summary of new commits: b297e63... - new ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/mpv] - new
commit b297e6306f55982106241ea6756e3a20b8883e21 Author: Jan Palus Date: Tue Jan 7 19:16:45 2014 +0100 - new mpv.spec | 147 +++ 1 file changed, 147 insertions(+) --- diff --git a/mpv.spec b/mpv.spec new file mode 100644 index 000..9ad20f6 --- /dev/null +++ b/mpv.spec @@ -0,0 +1,147 @@ +Summary: Movie player based on MPlayer and mplayer2 +Name: mpv +Version: 0.3.2 +Release: 0.1 +License: GPL v2+ +Group: Applications/Multimedia +Source0: http://github.com/mpv-player/%{name}/archive/v%{version}.tar.gz?/%{name}-%{version}.tar.gz +# Source0-md5: 516f2eeec1d1f69905d11c1feec8166e +URL: http://mpv.io/ +BuildRequires: Mesa-libwayland-egl-devel >= 9.0.0 +BuildRequires: OpenAL-devel >= 1.13 +BuildRequires: OpenGL-devel +BuildRequires: SDL-devel +BuildRequires: alsa-lib-devel +BuildRequires: enca-devel +BuildRequires: ffmpeg-devel +BuildRequires: jack-audio-connection-kit-devel +BuildRequires: ladspa-devel +BuildRequires: lcms2-devel +BuildRequires: libass-devel +BuildRequires: libcaca-devel >= 0.99 +BuildRequires: libcdio-paranoia-devel +BuildRequires: libdvdnav-devel >= 4.2.0 +BuildRequires: libdvdread-devel >= 4.1.0 +BuildRequires: libbluray-devel >= 0.2.1 +BuildRequires: libbs2b-devel +BuildRequires: libguess-devel +BuildRequires: libjpeg-devel +BuildRequires: libmpg123-devel >= 1.2.0 +BuildRequires: libquvi-devel < 0.9.0 +BuildRequires: libsmbclient-devel +BuildRequires: libv4l-devel +BuildRequires: libva-devel >= 1.2.0 +BuildRequires: libva-glx-devel >= 1.2.0 +BuildRequires: libvdpau-devel >= 0.2 +BuildRequires: lirc-devel +BuildRequires: ncurses-devel +BuildRequires: pkgconfig +BuildRequires: portaudio-devel >= 19 +BuildRequires: pulseaudio-devel >= 0.9 +BuildRequires: waf +BuildRequires: wayland-devel >= 1.2.0 +BuildRequires: xorg-lib-libX11-devel +BuildRequires: xorg-lib-libXScrnSaver-devel +BuildRequires: xorg-lib-libXdamage-devel +BuildRequires: xorg-lib-libXext-devel +BuildRequires: xorg-lib-libXinerama-devel +BuildRequires: xorg-lib-libXv-devel +BuildRequires: xorg-lib-libXxf86vm-devel +BuildRequires: xorg-lib-libxkbcommon-devel >= 0.3.0 +BuildRequires: xorg-proto-xproto-devel +Requires: OpenGL +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%define_noautoreqdep libGL.so.1 libGLU.so.1 + +%description +movie player based on MPlayer and mplayer2. + +%prep +%setup -q + +%build +CC="%{__cc}"; export CC +CFLAGS="%{rpmcflags}"; export CFLAGS +LINKFLAGS="%{rpmldflags}"; export LINKFLAGS +waf configure \ + --prefix=%{_prefix} \ + --bindir=%{_bindir} \ + --confdir=%{_sysconfdir}/mpv \ + --libdir=%{_libdir} \ + --datadir=%{_datadir} \ + --mandir=%{_mandir} \ + --disable-debug-build \ + --enable-alsa \ + --enable-audio-input \ + --enable-caca \ + --enable-cdda \ + --enable-dvb \ + --enable-dvbin \ + --enable-dvdnav \ + --enable-dvdread \ + --enable-enca \ + --enable-gl-wayland \ + --enable-gl-x11 \ + --enable-iconv \ + --enable-jack \ + --enable-joystick \ + --enable-jpeg \ + --enable-ladspa \ + --enable-lcms2 \ + --enable-libass \ + --enable-libbluray \ + --enable-libbs2b \ + --enable-libguess \ + --enable-libquvi4 \ + --enable-libsmbclient \ + --enable-libv4l2 \ + --enable-lirc \ + --enable-mpg123 \ + --enable-openal \ + --enable-oss-audio \ + --enable-portaudio \ + --enable-pulse \ + --enable-pvr \ + --enable-radio \ + --enable-radio-capture \ + --enable-radio-v4l2 \ + --enable-sdl \ + --enable-shm \ + --enable-terminfo \ + --enable-tv \ + --enable-tv-v4l2 \ + --enable-wayland \ + --enable-vaapi \ + --enable-vaapi-glx \ + --enable-vaapi-hwaccel \ + --enable-vaapi-vpp \ + --enable-vcd \ + --enable-vdpau \ + --enable-vdpau-hwaccel \ + --enable-x11 \ + --enable-xext \ + --enable-xf86vm \ + --enable-xf86xk \ + --enable-xinerama \ + --enable-xss \ + --enable-xv \ + +waf build -v + +%install +rm -rf $RPM_BUILD_ROOT + +waf install --destdir=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%dir %{_sysconfdir}/mpv +%{_sysconfdir}/mpv/encoding-profiles.conf +%attr(755,r
DISTFILES: waf: waf-1.7.14.tar.bz2
Files fetched: 1 STORED: http://waf.googlecode.com/files/waf-1.7.14.tar.bz2 c25c67426225873087736514b12db920 waf-1.7.14.tar.bz2 Size: 713726 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/waf] - up to 1.7.14 - don't clean *.py files (internal logic depends on them)
commit 8242068ec33bc4e87c46479e23226d8a40f0a58b Author: Jan Palus Date: Tue Jan 7 19:14:12 2014 +0100 - up to 1.7.14 - don't clean *.py files (internal logic depends on them) waf.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- diff --git a/waf.spec b/waf.spec index c050732..c457e84 100644 --- a/waf.spec +++ b/waf.spec @@ -1,14 +1,14 @@ Summary: The Waf build system Summary(pl.UTF-8): System budowania Waf Name: waf -Version: 1.7.13 +Version: 1.7.14 Release: 1 # note: waf book is on CC-BY-NC-ND (not included in binary package) License: BSD Group: Development/Building #Source0Download: http://code.google.com/p/waf/downloads/list Source0: http://waf.googlecode.com/files/%{name}-%{version}.tar.bz2 -# Source0-md5: 2b0f2fb5fc96b501c175df0e0f8572d4 +# Source0-md5: c25c67426225873087736514b12db920 Patch0:%{name}-path.patch URL: http://code.google.com/p/waf/ BuildRequires: python >= 1:2.6 @@ -58,7 +58,6 @@ install -D -p waf-light $RPM_BUILD_ROOT%{_bindir}/waf %py_comp $RPM_BUILD_ROOT%{_datadir}/waf/waflib %py_ocomp $RPM_BUILD_ROOT%{_datadir}/waf/waflib -%py_postclean %{_datadir}/waf/waflib %clean rm -rf $RPM_BUILD_ROOT gitweb: http://git.pld-linux.org/gitweb.cgi/packages/waf.git/commitdiff/8242068ec33bc4e87c46479e23226d8a40f0a58b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/asterisk/ASTERISK_12] corosync bcond name fix
commit 9912ed93c5397bbdded27f63459196f84bae769c Author: Jacek Konieczny Date: Tue Jan 7 18:50:30 2014 +0100 corosync bcond name fix asterisk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/asterisk.spec b/asterisk.spec index 0ef6312..e4dcd64 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -5,7 +5,7 @@ # # Conditional build: %bcond_withh323# without h323 support -%bcond_withverbose # res_corosync module (broken in 12.0.0) +%bcond_withcorosync# res_corosync module (broken in 12.0.0) %bcond_without apidocs # disable apidocs building %bcond_without verbose # verbose build gitweb: http://git.pld-linux.org/gitweb.cgi/packages/asterisk.git/commitdiff/9912ed93c5397bbdded27f63459196f84bae769c ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: python-ldap: python-ldap-2.4.13.tar.gz
Files fetched: 1 STORED: http://pypi.python.org/packages/source/p/python-ldap/python-ldap-2.4.13.tar.gz 74b7b50267761540451eade44b2049ee python-ldap-2.4.13.tar.gz Size: 135550 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-ldap] - 2.4.13
commit 26fdd4c34fe8419fc8398d2fffdc5e9b08c0eb96 Author: Jan Rękorajski Date: Tue Jan 7 18:39:30 2014 +0100 - 2.4.13 python-ldap.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/python-ldap.spec b/python-ldap.spec index 45adca2..1b0e2c0 100644 --- a/python-ldap.spec +++ b/python-ldap.spec @@ -2,17 +2,17 @@ # Conditional build: %bcond_without tests # do not perform "make test" -%definemodule ldap +%definemodule ldap Summary: LDAP Module for Python Summary(pl.UTF-8): Moduł LDAP dla Pythona Name: python-%{module} -Version: 2.4.10 +Version: 2.4.13 Release: 1 Epoch: 1 License: Public Domain Group: Libraries/Python Source0: http://pypi.python.org/packages/source/p/python-ldap/%{name}-%{version}.tar.gz -# Source0-md5: a15827ca13c90e9101e5e9405c1d83be +# Source0-md5: 74b7b50267761540451eade44b2049ee Patch0:%{name}-sasl2.patch Patch1:build.patch URL: http://python-ldap.sourceforge.net/ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/python-ldap.git/commitdiff/26fdd4c34fe8419fc8398d2fffdc5e9b08c0eb96 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/hhvm] package /etc/hhvm dir
commit aabac0d55a4609a6b40d9dc9be6ee71b0041e58f Author: Elan Ruusamäe Date: Fri Jan 3 16:41:32 2014 +0200 package /etc/hhvm dir hhvm.spec | 2 ++ 1 file changed, 2 insertions(+) --- diff --git a/hhvm.spec b/hhvm.spec index 4bfed92..ecd58a2 100644 --- a/hhvm.spec +++ b/hhvm.spec @@ -267,6 +267,7 @@ export HHVM_REPO_SCHEMA=$(date +%N_%s) %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT/etc/%{name} %{__make} install \ HPHP_HOME=$(pwd) \ DESTDIR=$RPM_BUILD_ROOT @@ -342,6 +343,7 @@ fi %files %defattr(644,root,root,755) %doc README.md hphp/NEWS +%dir /etc/%{name} %attr(755,root,root) %{_bindir}/hhvm %attr(755,root,root) %{_bindir}/hphp %attr(755,root,root) %{_libdir}/libevent-1.4.so.*.*.* gitweb: http://git.pld-linux.org/gitweb.cgi/packages/hhvm.git/commitdiff/aabac0d55a4609a6b40d9dc9be6ee71b0041e58f ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/hhvm] disable test building
commit dc7e02edc7996bc6696fe66c26ff333aeaf20f33 Author: Elan Ruusamäe Date: Fri Jan 3 16:41:19 2014 +0200 disable test building hhvm.spec| 5 - notest.patch | 18 ++ 2 files changed, 22 insertions(+), 1 deletion(-) --- diff --git a/hhvm.spec b/hhvm.spec index 32254cc..4bfed92 100644 --- a/hhvm.spec +++ b/hhvm.spec @@ -7,7 +7,7 @@ Summary: Virtual Machine, Runtime, and JIT for PHP Name: hhvm Version: 2.3.2 -Release: 0.19 +Release: 0.21 License: PHP 3.01 Group: Development/Languages Source0: https://github.com/facebook/hhvm/archive/HHVM-%{version}.tar.gz @@ -28,6 +28,7 @@ Patch5: system-folly.patch Patch6:checksum.patch Patch7:imap-gss.patch Patch8:hphpize.patch +Patch9:notest.patch URL: http://wiki.github.com/facebook/hiphop-php/ BuildRequires: apr-devel BuildRequires: autoconf @@ -190,6 +191,7 @@ sed -i -e '21 d' hphp/third_party/folly/folly/detail/Malloc.h %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 #%patch5 -p1 # prefer ones from system @@ -253,6 +255,7 @@ cd build -DCMAKE_PREFIX_PATH=%{_prefix} \ -DUSE_JEMALLOC=OFF \ -DUSE_TCMALLOC=OFF \ + -DHPHP_NOTEST=ON \ ./ # setup COMPILER_ID/HHVM_REPO_SCHEMA so it doesn't look it up from our package git repo diff --git a/notest.patch b/notest.patch new file mode 100644 index 000..ad671b8 --- /dev/null +++ b/notest.patch @@ -0,0 +1,18 @@ +env NOTEST does not seem to work, still seeing + + Linking CXX executable test + +in the output. + +and linking 800mb executable, with embedding systemlibs to it, while no tests are performed, is making packaging really slow. +--- hhvm-HHVM-2.3.2/hphp/CMakeLists.txt~ 2013-12-23 20:51:42.0 + hhvm-HHVM-2.3.2/hphp/CMakeLists.txt2014-01-03 08:35:29.988356817 + +@@ -52,7 +52,7 @@ + + add_subdirectory(hhvm) + +-if (NOT "$ENV{HPHP_NOTEST}" STREQUAL "1") ++if (NOT HPHP_NOTEST) + add_subdirectory(test) + endif () + gitweb: http://git.pld-linux.org/gitweb.cgi/packages/hhvm.git/commitdiff/aabac0d55a4609a6b40d9dc9be6ee71b0041e58f ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/asterisk/ASTERISK_12] TODO cleanup
commit ae59ee51a1d34f333d714ea6c75bea73657d6d5b Author: Jacek Konieczny Date: Tue Jan 7 16:34:59 2014 +0100 TODO cleanup obsolete entries (some as old as our asterisk.spec) removed asterisk.spec | 16 1 file changed, 16 deletions(-) --- diff --git a/asterisk.spec b/asterisk.spec index 1c71d66..0ef6312 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -1,23 +1,7 @@ # TODO: # - check/fix build with our h323. Does anybody still use H.323, anyway? -# - cgi-bin package - separate, because of suid-root # - use shared versions of LIBILBC:=ilbc/libilbc.a (ilbc not enabled currently) -# - CFLAGS passing # - make package for moh sound files -# - likely odbc and imap broken (identical code, some #define not working, etc): -# *** WARNING: identical binaries are copied, not linked: -# %attr(755,root,root) %{_libdir}/asterisk/modules/app_directory_odbc.so -# and /usr/lib64/asterisk/modules/app_directory_imap.so -# *** WARNING: identical binaries are copied, not linked: -# %attr(755,root,root) %{_libdir}/asterisk/modules/app_directory_plain.so -# and /usr/lib64/asterisk/modules/app_directory_imap.so -# - ncurses dep gone for good (replaced by libedit)? -# - missing/failed features: -# $ grep =0 build_tools/menuselect-deps -# NBS=0 AST_EXT_LIB_SETUP([NBS], [Network Broadcast Sound], [nbs]) -# SS7=0 AST_EXT_LIB_SETUP([SS7], [ISDN SS7], [ss7]) -# VPBAPI=0 AST_EXT_LIB_SETUP([VPB], [Voicetronix API], [vpb]) -# - %attr(755,root,root) %{_libdir}/asterisk/modules/chan_usbradio.so # # Conditional build: %bcond_withh323# without h323 support gitweb: http://git.pld-linux.org/gitweb.cgi/packages/asterisk.git/commitdiff/ae59ee51a1d34f333d714ea6c75bea73657d6d5b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/asterisk/ASTERISK_12] dropping modules removed upstream
commit faacc6f3d00d81c6ecf37d23e48c7db3e792a8e4 Author: Jacek Konieczny Date: Tue Jan 7 16:21:15 2014 +0100 dropping modules removed upstream asterisk.spec | 4 1 file changed, 4 deletions(-) --- diff --git a/asterisk.spec b/asterisk.spec index 947acce..91ec9d1 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -839,7 +839,6 @@ chown -R asterisk:asterisk /var/lib/asterisk %attr(755,root,root) %{_libdir}/asterisk/modules/app_mp3.so %attr(755,root,root) %{_libdir}/asterisk/modules/app_nbscat.so %attr(755,root,root) %{_libdir}/asterisk/modules/app_originate.so -%attr(755,root,root) %{_libdir}/asterisk/modules/app_parkandannounce.so %attr(755,root,root) %{_libdir}/asterisk/modules/app_playback.so %attr(755,root,root) %{_libdir}/asterisk/modules/app_playtones.so %attr(755,root,root) %{_libdir}/asterisk/modules/app_privacy.so @@ -876,10 +875,7 @@ chown -R asterisk:asterisk /var/lib/asterisk %attr(755,root,root) %{_libdir}/asterisk/modules/cdr_syslog.so %attr(755,root,root) %{_libdir}/asterisk/modules/cel_custom.so %attr(755,root,root) %{_libdir}/asterisk/modules/cel_manager.so -%attr(755,root,root) %{_libdir}/asterisk/modules/chan_agent.so -%attr(755,root,root) %{_libdir}/asterisk/modules/chan_bridge.so %attr(755,root,root) %{_libdir}/asterisk/modules/chan_iax2.so -%attr(755,root,root) %{_libdir}/asterisk/modules/chan_local.so %attr(755,root,root) %{_libdir}/asterisk/modules/chan_mobile.so %attr(755,root,root) %{_libdir}/asterisk/modules/chan_mgcp.so %attr(755,root,root) %{_libdir}/asterisk/modules/chan_multicast_rtp.so gitweb: http://git.pld-linux.org/gitweb.cgi/packages/asterisk.git/commitdiff/ae59ee51a1d34f333d714ea6c75bea73657d6d5b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/asterisk/ASTERISK_12] - install fixes
commit 216f94ae79411070960bb24967ba0557a933f9ad Author: Jacek Konieczny Date: Tue Jan 7 16:20:15 2014 +0100 - install fixes asterisk.spec | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) --- diff --git a/asterisk.spec b/asterisk.spec index e527c22..947acce 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -105,7 +105,7 @@ BuildRequires: postgresql-devel BuildRequires: ptlib-devel %endif BuildRequires: radiusclient-ng-devel -BuildRequires: rpmbuild(macros) >= 1.268 +BuildRequires: rpmbuild(macros) >= 1.583 BuildRequires: sed >= 4.0 BuildRequires: spandsp-devel >= 0.0.5 BuildRequires: speex-devel @@ -136,6 +136,9 @@ Provides: user(asterisk) Conflicts: logrotate < 3.8.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +# references symbols in the asterisk binary +%defineskip_post_check_so libasteriskssl.so.* + %description Asterisk is an Open Source PBX and telephony development platform that can both replace a conventional PBX and act as a platform for @@ -684,12 +687,9 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man8/safe_asterisk.8* rm -rf $RPM_BUILD_ROOT%{_datadir}/asterisk/firmware/iax/* %if %{with apidocs} -find doc/api/html -name '*.map' -size 0 -delete +find doc/api -name '*.map' -size 0 -delete %endif -#fixme -rm $RPM_BUILD_ROOT/etc/asterisk/{app_mysql,cdr_mysql,chan_mobile,misdn%{!?with_h323:,chan_ooh323},res_pktccops,h323}.conf - rm -fr $RPM_BUILD_ROOT/usr/include/asterisk/doxygen %clean @@ -1030,7 +1030,7 @@ chown -R asterisk:asterisk /var/lib/asterisk %if %{with apidocs} %files apidocs %defattr(644,root,root,755) -%doc doc/api/html/* +%doc doc/api/* %endif %files alsa gitweb: http://git.pld-linux.org/gitweb.cgi/packages/asterisk.git/commitdiff/ae59ee51a1d34f333d714ea6c75bea73657d6d5b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/pjproject] Release: 1
commit 9e7720207d7855216a9ef2141c8d3abb075380f4 Author: Jacek Konieczny Date: Tue Jan 7 16:36:52 2014 +0100 Release: 1 pjproject.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/pjproject.spec b/pjproject.spec index 2c68e78..494856f 100644 --- a/pjproject.spec +++ b/pjproject.spec @@ -25,7 +25,7 @@ Summary: PJSIP - free and open source multimedia communication library Name: pjproject Version: 2.1.0_digium_%{snap_ts} -Release: 0.1 +Release: 1 License: GPL v2+ Group: Libraries Source0: https://github.com/asterisk/pjproject/archive/%{snap_hash}.tar.gz gitweb: http://git.pld-linux.org/gitweb.cgi/packages/pjproject.git/commitdiff/9e7720207d7855216a9ef2141c8d3abb075380f4 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/asterisk/ASTERISK_12] Disable corosync for now
commit 839d3beab26b46aa3fde8daf92a1a463051e61c0 Author: Jacek Konieczny Date: Tue Jan 7 15:20:01 2014 +0100 Disable corosync for now It is broken – https://issues.asterisk.org/jira/browse/ASTERISK-22912 asterisk.spec | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) --- diff --git a/asterisk.spec b/asterisk.spec index d1097fa..7086173 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -21,6 +21,7 @@ # # Conditional build: %bcond_withh323# without h323 support +%bcond_withverbose # res_corosync module (broken in 12.0.0) %bcond_without apidocs # disable apidocs building %bcond_without verbose # verbose build @@ -56,7 +57,7 @@ BuildRequires:autoconf BuildRequires: automake BuildRequires: bison BuildRequires: bluez-libs-devel -BuildRequires: corosync-devel >= 2.0.0 +%{?with_corosync:BuildRequires:corosync-devel >= 2.0.0} BuildRequires: curl-devel BuildRequires: dahdi-linux-devel BuildRequires: dahdi-tools-devel >= 2.0.0 @@ -519,6 +520,9 @@ install %{SOURCE13} . %if %{without h323} sed -i -e 's#\(MENUSELECT_ADDONS=.*\)#\1 chan_ooh323#g' menuselect.makeopts %endif +%if %{without corosync} +sed -i -e 's#\(MENUSELECT_RES=.*\)#\1 res_corosync#g' menuselect.makeopts +%endif %build rm -f pbx/.depend gitweb: http://git.pld-linux.org/gitweb.cgi/packages/asterisk.git/commitdiff/ae59ee51a1d34f333d714ea6c75bea73657d6d5b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/asterisk/ASTERISK_12] clean up %files
commit aacee57832db06a15db1f939765cdbee4c6b1a63 Author: Jacek Konieczny Date: Tue Jan 7 16:23:31 2014 +0100 clean up %files drop files that were not and are not there asterisk.spec | 17 - 1 file changed, 17 deletions(-) --- diff --git a/asterisk.spec b/asterisk.spec index 91ec9d1..1c71d66 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -728,20 +728,13 @@ chown -R asterisk:asterisk /var/lib/asterisk %doc README *.txt ChangeLog BUGS CREDITS configs %doc doc/asterisk.sgml -#%attr(755,root,root) %{_sbindir}/aelparse %attr(755,root,root) %{_sbindir}/astcanary %attr(755,root,root) %{_sbindir}/astdb2bdb %attr(755,root,root) %{_sbindir}/astdb2sqlite3 %attr(755,root,root) %{_sbindir}/asterisk %attr(755,root,root) %{_sbindir}/astgenkey %attr(755,root,root) %{_sbindir}/autosupport -#%attr(755,root,root) %{_sbindir}/conf2ael -#%attr(755,root,root) %{_sbindir}/muted %attr(755,root,root) %{_sbindir}/rasterisk -#%attr(755,root,root) %{_sbindir}/refcounter -#%attr(755,root,root) %{_sbindir}/smsq -#%attr(755,root,root) %{_sbindir}/stereorize -#%attr(755,root,root) %{_sbindir}/streamplayer %{_mandir}/man8/asterisk.8* %{_mandir}/man8/astgenkey.8* %{_mandir}/man8/autosupport.8* @@ -752,7 +745,6 @@ chown -R asterisk:asterisk /var/lib/asterisk %attr(750,root,asterisk) %dir %{_sysconfdir}/asterisk %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/adsi.conf -#%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/adtranvofr.conf %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/agents.conf %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/alarmreceiver.conf %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/amd.conf @@ -979,8 +971,6 @@ chown -R asterisk:asterisk /var/lib/asterisk %attr(755,root,root) %{_libdir}/asterisk/modules/res_stun_monitor.so %attr(755,root,root) %{_libdir}/asterisk/modules/res_timing_pthread.so %attr(755,root,root) %{_libdir}/asterisk/modules/res_timing_timerfd.so -#%attr(755,root,root) %{_libdir}/asterisk/modules/test_dlinklists.so -#%attr(755,root,root) %{_libdir}/asterisk/modules/test_heap.so /usr/lib/tmpfiles.d/%{name}.conf %dir %{_datadir}/asterisk @@ -1034,10 +1024,6 @@ chown -R asterisk:asterisk /var/lib/asterisk %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/alsa.conf %attr(755,root,root) %{_libdir}/asterisk/modules/chan_alsa.so -#%files astman -#%defattr(644,root,root,755) -#%attr(755,root,root) %{_sbindir}/astman - %files curl %defattr(644,root,root,755) %doc contrib/scripts/dbsep.cgi @@ -1051,9 +1037,7 @@ chown -R asterisk:asterisk /var/lib/asterisk %defattr(644,root,root,755) %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/meetme.conf %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/chan_dahdi.conf -#%attr(755,root,root) %{_libdir}/asterisk/modules/app_dahdibarge.so %attr(755,root,root) %{_libdir}/asterisk/modules/app_dahdiras.so -#%attr(755,root,root) %{_libdir}/asterisk/modules/app_dahdiscan.so %attr(755,root,root) %{_libdir}/asterisk/modules/app_flash.so %attr(755,root,root) %{_libdir}/asterisk/modules/app_meetme.so %attr(755,root,root) %{_libdir}/asterisk/modules/app_page.so @@ -1205,7 +1189,6 @@ chown -R asterisk:asterisk /var/lib/asterisk %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/cel_sqlite3_custom.conf %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/res_config_sqlite.conf %attr(755,root,root) %{_libdir}/asterisk/modules/cdr_sqlite3_custom.so -#%attr(755,root,root) %{_libdir}/asterisk/modules/cdr_sqlite.so %attr(755,root,root) %{_libdir}/asterisk/modules/cel_sqlite3_custom.so %attr(755,root,root) %{_libdir}/asterisk/modules/res_config_sqlite.so gitweb: http://git.pld-linux.org/gitweb.cgi/packages/asterisk.git/commitdiff/ae59ee51a1d34f333d714ea6c75bea73657d6d5b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/asterisk/ASTERISK_12] Set default voicemail storage to FILE_STORAGE
commit a0ec6f170f91b7273d81f557682939b40338ccf1 Author: Jacek Konieczny Date: Tue Jan 7 15:21:18 2014 +0100 Set default voicemail storage to FILE_STORAGE The value in menuselect.makeopts can be easily broken when updating the file, so set it explicitely in the spec too. asterisk.spec | 1 + menuselect.makeopts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) --- diff --git a/asterisk.spec b/asterisk.spec index 7086173..929c396 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -556,6 +556,7 @@ cd .. cp -f .cleancount .lastclean +%{__sed} -i -e 's/^MENUSELECT_OPTS_app_voicemail=.*$/MENUSELECT_OPTS_app_voicemail=FILE_STORAGE/' menuselect.makeopts %{__make} DEBUG= \ OPTIMIZE= \ ASTVARRUNDIR=%{_localstatedir}/run/asterisk \ diff --git a/menuselect.makeopts b/menuselect.makeopts index 8c396f6..658df0c 100644 --- a/menuselect.makeopts +++ b/menuselect.makeopts @@ -11,7 +11,7 @@ MENUSELECT_PBX= MENUSELECT_RES=res_stasis_test res_timing_kqueue MENUSELECT_TESTS=test_abstract_jb test_acl test_amihooks test_aoc test_app test_ari test_ari_model test_ast_format_str_reduce test_astobj2 test_astobj2_thrash test_bucket test_cdr test_cel test_config test_db test_devicestate test_dlinklists test_endpoints test_event test_expr test_format_api test_func_file test_gosub test_hashtab_thrash test_heap test_jitterbuf test_json test_linkedlists test_locale test_logger test_netsock2 test_optional_api test_pbx test_poll test_res_stasis test_sched test_scoped_lock test_security_events test_skel test_sorcery test_sorcery_astdb test_sorcery_realtime test_stasis test_stasis_channels test_stasis_endpoints test_stringfields test_strings test_substitution test_taskprocessor test_threadpool test_time test_utils test_uuid test_voicemail_api test_xml_escape MENUSELECT_CFLAGS=LOADABLE_MODULES -MENUSELECT_OPTS_app_voicemail=ODBC_STORAGE +MENUSELECT_OPTS_app_voicemail=FILE_STORAGE MENUSELECT_UTILS=astcanary astdb2sqlite3 astdb2bdb MENUSELECT_AGIS= MENUSELECT_EMBED= gitweb: http://git.pld-linux.org/gitweb.cgi/packages/asterisk.git/commitdiff/ae59ee51a1d34f333d714ea6c75bea73657d6d5b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/asterisk/ASTERISK_12] drop broken histedit.h include
commit a27da6da391e0d3b8f2aa4c17de1730663a59a09 Author: Jacek Konieczny Date: Tue Jan 7 15:23:45 2014 +0100 drop broken histedit.h include The right file is included earlier asterisk-histedit.patch | 11 +++ asterisk.spec | 2 ++ 2 files changed, 13 insertions(+) --- diff --git a/asterisk.spec b/asterisk.spec index 929c396..e527c22 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -49,6 +49,7 @@ Patch3: %{name}-ppc.patch Patch4:FHS-paths.patch Patch5:pld-banner.patch Patch6:lpc10-system.patch +Patch7:%{name}-histedit.patch URL: http://www.asterisk.org/ BuildRequires: OSPToolkit-devel >= 4.0.0 BuildRequires: SDL_image-devel @@ -506,6 +507,7 @@ API documentation for Asterisk. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 # Fixup makefile so sound archives aren't downloaded/installed %{__sed} -i -e 's/^all:.*$/all:/' sounds/Makefile diff --git a/asterisk-histedit.patch b/asterisk-histedit.patch new file mode 100644 index 000..682d1be --- /dev/null +++ b/asterisk-histedit.patch @@ -0,0 +1,11 @@ +diff -dur asterisk-12.0.0.orig/main/asterisk.c asterisk-12.0.0/main/asterisk.c +--- asterisk-12.0.0.orig/main/asterisk.c 2014-01-07 15:18:43.0 +0100 asterisk-12.0.0/main/asterisk.c2014-01-07 15:18:21.0 +0100 +@@ -223,7 +223,6 @@ + #include "asterisk/utils.h" + #include "asterisk/file.h" + #include "asterisk/io.h" +-#include "editline/histedit.h" + #include "asterisk/config.h" + #include "asterisk/ast_version.h" + #include "asterisk/linkedlists.h" gitweb: http://git.pld-linux.org/gitweb.cgi/packages/asterisk.git/commitdiff/ae59ee51a1d34f333d714ea6c75bea73657d6d5b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/asterisk/ASTERISK_12] drop obsolete mISDN 1.x support
commit 88778e37c6374070df0a00828fd41e35cb943ce1 Author: Jacek Konieczny Date: Tue Jan 7 09:34:04 2014 +0100 drop obsolete mISDN 1.x support Current mISDN subsystem in kernel is mISDN 2, which can be integrated with asterisk through the 'lcr' package. asterisk.spec | 21 - 1 file changed, 21 deletions(-) --- diff --git a/asterisk.spec b/asterisk.spec index 3872fe5..dbe7862 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -19,7 +19,6 @@ # - %attr(755,root,root) %{_libdir}/asterisk/modules/chan_usbradio.so # # Conditional build: -%bcond_withmisdn # chan_misdn requires ancient mISDN (1.x) %bcond_withopenais # openais is dead project %bcond_without h323# without h323 support %bcond_without apidocs # disable apidocs building @@ -86,10 +85,6 @@ BuildRequires: libvorbis-devel BuildRequires: libxml2-devel BuildRequires: lpc10-devel BuildRequires: lua51-devel -%if %{with misdn} -BuildRequires: mISDNuser-devel >= 1.2 -BuildConflicts:mISDNuser-devel >= 2.0 -%endif BuildRequires: mxml-devel BuildRequires: mysql-devel BuildRequires: ncurses-devel @@ -327,15 +322,6 @@ Requires: %{name} = %{version}-%{release} %description lpc10 LPC-10 2400 bps Voice Codec support -%package misdn -Summary: mISDN channel for Asterisk -Group: Applications/Networking -Requires(pre): /usr/sbin/usermod -Requires: %{name} = %{version}-%{release} - -%description misdn -mISDN channel for Asterisk. - %package minivm Summary: MiniVM applicaton for Asterisk Group: Applications/Networking @@ -1164,13 +1150,6 @@ chown -R asterisk:asterisk /var/lib/asterisk %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/minivm.conf %attr(755,root,root) %{_libdir}/asterisk/modules/app_minivm.so -%if %{with misdn} -%files misdn -%defattr(644,root,root,755) -%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/misdn.conf -%attr(755,root,root) %{_libdir}/asterisk/modules/chan_misdn.so -%endif - %files odbc %defattr(644,root,root,755) %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/cdr_adaptive_odbc.conf gitweb: http://git.pld-linux.org/gitweb.cgi/packages/asterisk.git/commitdiff/ae59ee51a1d34f333d714ea6c75bea73657d6d5b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/asterisk/ASTERISK_12] disable h323
commit fa052d68f28351cd81c24728baf88741a1f36997 Author: Jacek Konieczny Date: Tue Jan 7 10:54:01 2014 +0100 disable h323 Won't build with out h323plus: > checking if OpenH323 version 1.24.0 is compatible with chan_h323... no Does anybody really still need that? asterisk.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- diff --git a/asterisk.spec b/asterisk.spec index de2bf37..4a40461 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -1,4 +1,5 @@ # TODO: +# - check/fix build with our h323. Does anybody still use H.323, anyway? # - cgi-bin package - separate, because of suid-root # - use shared versions of LIBILBC:=ilbc/libilbc.a (ilbc not enabled currently) # - CFLAGS passing @@ -19,7 +20,7 @@ # - %attr(755,root,root) %{_libdir}/asterisk/modules/chan_usbradio.so # # Conditional build: -%bcond_without h323# without h323 support +%bcond_withh323# without h323 support %bcond_without apidocs # disable apidocs building %bcond_without verbose # verbose build gitweb: http://git.pld-linux.org/gitweb.cgi/packages/asterisk.git/commitdiff/ae59ee51a1d34f333d714ea6c75bea73657d6d5b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/asterisk/ASTERISK_12] drop obsolete openais
commit 74815585552b03e4d6536213c6e62fc6004964e4 Author: Jacek Konieczny Date: Tue Jan 7 09:35:28 2014 +0100 drop obsolete openais asterisk.spec | 9 - 1 file changed, 9 deletions(-) --- diff --git a/asterisk.spec b/asterisk.spec index dbe7862..4d1fb75 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -19,7 +19,6 @@ # - %attr(755,root,root) %{_libdir}/asterisk/modules/chan_usbradio.so # # Conditional build: -%bcond_withopenais # openais is dead project %bcond_without h323# without h323 support %bcond_without apidocs # disable apidocs building %bcond_without verbose # verbose build @@ -91,7 +90,6 @@ BuildRequires:ncurses-devel BuildRequires: neon-devel BuildRequires: net-snmp-devel BuildRequires: newt-devel -%{?with_openais:BuildRequires: openais-devel} %if %{with h323} BuildRequires: h323plus-devel >= 1.24.0 %endif @@ -1036,13 +1034,6 @@ chown -R asterisk:asterisk /var/lib/asterisk %doc doc/api/html/* %endif -%if %{with openais} -%files ais -%defattr(644,root,root,755) -%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/ais.conf -%attr(755,root,root) %{_libdir}/asterisk/modules/res_ais.so -%endif - %files alsa %defattr(644,root,root,755) %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/alsa.conf gitweb: http://git.pld-linux.org/gitweb.cgi/packages/asterisk.git/commitdiff/ae59ee51a1d34f333d714ea6c75bea73657d6d5b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/asterisk/ASTERISK_12] drop obsolete 'rxfax'
commit 0a62ee790805918a5a9ce2792daeb66d7a814334 Author: Jacek Konieczny Date: Tue Jan 7 09:23:12 2014 +0100 drop obsolete 'rxfax' asterisk.spec | 15 --- 1 file changed, 15 deletions(-) --- diff --git a/asterisk.spec b/asterisk.spec index 2530a18..8a13507 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -17,12 +17,8 @@ # SS7=0 AST_EXT_LIB_SETUP([SS7], [ISDN SS7], [ss7]) # VPBAPI=0 AST_EXT_LIB_SETUP([VPB], [Voicetronix API], [vpb]) # - %attr(755,root,root) %{_libdir}/asterisk/modules/chan_usbradio.so -# - app_{rx,tx}fax seems to b replaced by app_fax alongside latest spanddsp -# See: http://sourceforge.net/projects/agx-ast-addons/ -# https://agx-ast-addons.svn.sourceforge.net/svnroot/agx-ast-addons/trunk/attic/ # # Conditional build: -%bcond_withrxfax # without rx (also tx:-D) fax %bcond_withzhone # zhone hack %bcond_withzhone_hack # huge hack workarounding broken zhone channel banks which start randomly # issuing pulse-dialled calls to weird numbers @@ -32,7 +28,6 @@ %bcond_without apidocs # disable apidocs building %bcond_without verbose # verbose build -%definespandsp_version 0.0.2pre26 %definerel 0.1 Summary: Asterisk PBX Summary(pl.UTF-8): Centralka (PBX) Asterisk @@ -47,8 +42,6 @@ Source1: %{name}.init Source2: %{name}.sysconfig Source3: %{name}.tmpfiles Source5: %{name}.logrotate -Source10: app_txfax.c -Source11: app_rxfax.c # menuselect.* -> make menuconfig; choose options; copy resulting files here Source12: menuselect.makedeps Source13: menuselect.makeopts @@ -62,8 +55,6 @@ Patch6: pkg-config-gmime.patch Patch7:FHS-paths.patch Patch8:libedit-history.patch Patch9:pld-banner.patch -# http://soft-switch.org/downloads/spandsp/spandsp-%{spandsp_version}/asterisk-1.2.x/apps_Makefile.patch -Patch10: %{name}-txfax-Makefile.patch Patch12: %{name}-zhone.patch Patch16: lpc10-system.patch Patch17: gsm-libpoison.patch @@ -540,12 +531,6 @@ API documentation for Asterisk. %if %{with zhone} sed -i -e 's|.*#define.*ZHONE_HACK.*|#define ZHONE_HACK 1|g' channels/chan_zap.c %endif -%if %{with rxfax} -cd apps -%patch10 -p0 -cp %{SOURCE10} . -cp %{SOURCE11} . -%endif %{?with_zhonehack:%patch12 -p1} %patch16 -p1 #%patch17 -p1 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/asterisk.git/commitdiff/ae59ee51a1d34f333d714ea6c75bea73657d6d5b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/asterisk/ASTERISK_12] BR and menuselect.* updates
commit 1dac8036d754ba054b84059a6167c8c75e05c00a Author: Jacek Konieczny Date: Tue Jan 7 14:28:30 2014 +0100 BR and menuselect.* updates - new OSPToolkit-devel required - jansson library required – corosync libraries used - pjproject for the new SIP channel asterisk.spec | 8 +- menuselect.makedeps | 72 - menuselect.makeopts | 36 ++- 3 files changed, 103 insertions(+), 13 deletions(-) --- diff --git a/asterisk.spec b/asterisk.spec index 4a40461..d1097fa 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -49,13 +49,14 @@ Patch4: FHS-paths.patch Patch5:pld-banner.patch Patch6:lpc10-system.patch URL: http://www.asterisk.org/ -BuildRequires: OSPToolkit-devel >= 3.6.1 +BuildRequires: OSPToolkit-devel >= 4.0.0 BuildRequires: SDL_image-devel BuildRequires: alsa-lib-devel BuildRequires: autoconf BuildRequires: automake BuildRequires: bison BuildRequires: bluez-libs-devel +BuildRequires: corosync-devel >= 2.0.0 BuildRequires: curl-devel BuildRequires: dahdi-linux-devel BuildRequires: dahdi-tools-devel >= 2.0.0 @@ -68,14 +69,17 @@ BuildRequires: gtk+2-devel BuildRequires: iksemel-devel BuildRequires: imap-devel BuildRequires: jack-audio-connection-kit-devel +BuildRequires: jansson-devel BuildRequires: libcap-devel BuildRequires: libedit-devel BuildRequires: libgsm-devel BuildRequires: libical-devel BuildRequires: libogg-devel BuildRequires: libresample-devel +BuildRequires: libuuid-devel BuildRequires: libvorbis-devel BuildRequires: libxml2-devel +BuildRequires: libxslt-devel BuildRequires: lpc10-devel BuildRequires: lua51-devel BuildRequires: mxml-devel @@ -90,6 +94,7 @@ BuildRequires:h323plus-devel >= 1.24.0 BuildRequires: openldap-devel BuildRequires: openssl-devel >= 0.9.7d BuildRequires: pam-devel +BuildRequires: pjproject-devel BuildRequires: pkgconfig BuildRequires: popt-devel BuildRequires: portaudio-devel >= 19 @@ -106,6 +111,7 @@ BuildRequires: sqlite-devel BuildRequires: sqlite3-devel BuildRequires: srtp-devel BuildRequires: unixODBC-devel +BuildRequires: uriparser-devel BuildRequires: xorg-lib-libX11-devel BuildRequires: zlib-devel BuildRequires: libpri-devel >= 1.4.6 diff --git a/menuselect.makedeps b/menuselect.makedeps index 64d79a8..5651b41 100644 --- a/menuselect.makedeps +++ b/menuselect.makedeps @@ -3,7 +3,6 @@ MENUSELECT_DEPENDS_res_config_mysql=MYSQLCLIENT MENUSELECT_DEPENDS_app_mysql=MYSQLCLIENT MENUSELECT_DEPENDS_cdr_mysql=MYSQLCLIENT MENUSELECT_DEPENDS_app_flash=DAHDI -MENUSELECT_DEPENDS_app_page=DAHDI MENUSELECT_DEPENDS_app_dahdiras=DAHDI MENUSELECT_DEPENDS_app_fax=SPANDSP MENUSELECT_DEPENDS_app_jack=JACK RESAMPLE @@ -22,24 +21,28 @@ MENUSELECT_DEPENDS_cel_sqlite3_custom=SQLITE3 MENUSELECT_DEPENDS_cel_tds=FREETDS MENUSELECT_DEPENDS_chan_dahdi=DAHDI TONEZONE PRI SS7 OPENR2 MENUSELECT_DEPENDS_chan_iax2=CRYPTO +MENUSELECT_DEPENDS_chan_motif=IKSEMEL OPENSSL +MENUSELECT_DEPENDS_chan_pjsip=PJPROJECT MENUSELECT_DEPENDS_chan_alsa=ALSA MENUSELECT_DEPENDS_chan_console=PORTAUDIO -MENUSELECT_DEPENDS_chan_gtalk=IKSEMEL OPENSSL -MENUSELECT_DEPENDS_chan_jingle=IKSEMEL OPENSSL MENUSELECT_DEPENDS_chan_misdn=ISDNNET MISDN SUPPSERV MENUSELECT_DEPENDS_chan_nbs=NBS MENUSELECT_DEPENDS_chan_oss=OSS MENUSELECT_DEPENDS_chan_phone=IXJUSER MENUSELECT_DEPENDS_chan_vpb=VPB +MENUSELECT_DEPENDS_chan_gtalk=IKSEMEL OPENSSL MENUSELECT_DEPENDS_chan_h323=OPENH323 +MENUSELECT_DEPENDS_chan_jingle=IKSEMEL OPENSSL MENUSELECT_DEPENDS_codec_dahdi=DAHDI MENUSELECT_DEPENDS_codec_gsm=GSM +MENUSELECT_DEPENDS_codec_ilbc=ILBC MENUSELECT_DEPENDS_codec_speex=SPEEX SPEEX_PREPROCESS SPEEXDSP MENUSELECT_DEPENDS_codec_lpc10=LPC10 MENUSELECT_DEPENDS_format_ogg_vorbis=VORBIS OGG MENUSELECT_DEPENDS_func_aes=CRYPTO MENUSELECT_DEPENDS_func_curl=CURL MENUSELECT_DEPENDS_func_iconv=ICONV +MENUSELECT_DEPENDS_func_pjsip_endpoint=PJPROJECT MENUSELECT_DEPENDS_func_speex=SPEEX SPEEX_PREPROCESS SPEEXDSP MENUSELECT_DEPENDS_pbx_dundi=ZLIB CRYPTO MENUSELECT_DEPENDS_pbx_lua=LUA @@ -48,32 +51,73 @@ MENUSELECT_DEPENDS_res_calendar_ews=NEON29 MENUSELECT_DEPENDS_res_calendar_exchange=NEON ICAL IKSEMEL MENUSELECT_DEPENDS_res_calendar_icalendar=NEON ICAL MENUSELECT_DEPENDS_res_config_curl=CURL +MENUSELECT_DEPENDS_res_config_sqlite3=SQLITE3 MENUSELECT_DEPENDS_res_crypto=OPENSSL MENUSELECT_DEPENDS_res_curl=CURL MENUSELECT_DEPENDS_res_http_post=GMIME MENUSELECT_DEPENDS_res_odbc=GENERIC_ODBC LTDL +MENUSELECT_DEPENDS_res_pjsip=PJPROJECT +MENUSELECT_DEPENDS_res_pjsip_acl=PJPROJECT +MENUSELECT_DEPENDS_res_pjsip_authenticator_digest=PJPROJECT +MENUSELECT_DEPENDS_res_pjsip_caller_id=PJPROJECT +MENUSELECT_DEPENDS_res_pjsip_diversion=PJPROJECT +MENUSELECT_DEPENDS_res_pjsip_dtmf_info=PJPROJECT +MENUSELECT_DEPENDS_res_pjsip_endpoint_identifier_anonymous=PJPROJECT +MENUSEL
[packages/asterisk/ASTERISK_12] drop unmaintained zhone hacks
commit 5580b52fb5d87110b03a49de155a45edd8d30e17 Author: Jacek Konieczny Date: Tue Jan 7 09:31:43 2014 +0100 drop unmaintained zhone hacks asterisk.spec | 8 1 file changed, 8 deletions(-) --- diff --git a/asterisk.spec b/asterisk.spec index 8a13507..3872fe5 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -19,9 +19,6 @@ # - %attr(755,root,root) %{_libdir}/asterisk/modules/chan_usbradio.so # # Conditional build: -%bcond_withzhone # zhone hack -%bcond_withzhone_hack # huge hack workarounding broken zhone channel banks which start randomly - # issuing pulse-dialled calls to weird numbers %bcond_withmisdn # chan_misdn requires ancient mISDN (1.x) %bcond_withopenais # openais is dead project %bcond_without h323# without h323 support @@ -55,7 +52,6 @@ Patch6: pkg-config-gmime.patch Patch7:FHS-paths.patch Patch8:libedit-history.patch Patch9:pld-banner.patch -Patch12: %{name}-zhone.patch Patch16: lpc10-system.patch Patch17: gsm-libpoison.patch Patch18: Fix-history-loading-when-using-external-libedit.patch @@ -528,10 +524,6 @@ API documentation for Asterisk. %patch7 -p1 %patch8 -p1 %patch9 -p1 -%if %{with zhone} -sed -i -e 's|.*#define.*ZHONE_HACK.*|#define ZHONE_HACK 1|g' channels/chan_zap.c -%endif -%{?with_zhonehack:%patch12 -p1} %patch16 -p1 #%patch17 -p1 %patch18 -p1 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/asterisk.git/commitdiff/ae59ee51a1d34f333d714ea6c75bea73657d6d5b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/OSPToolkit] sourceforge download url changed
commit 0210ed07be23661137bd1fb3c6bbb6e7c0d61c2d Author: Jacek Konieczny Date: Tue Jan 7 15:07:45 2014 +0100 sourceforge download url changed OSPToolkit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/OSPToolkit.spec b/OSPToolkit.spec index 5686a0c..43f097d 100644 --- a/OSPToolkit.spec +++ b/OSPToolkit.spec @@ -5,7 +5,7 @@ Version:4.2.0 Release: 1 License: BSD Group: Libraries -Source0: http://dl.sourceforge.net/osp-toolkit/%{name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/osp-toolkit/%{name}-%{version}.tar.gz # Source0-md5: edb0ac6d84cf6da0f0406f3d356b6204 Patch0:sharedlib.patch URL: http://www.freerouteserver.com/index.php/osp-toolkit gitweb: http://git.pld-linux.org/gitweb.cgi/packages/OSPToolkit.git/commitdiff/0210ed07be23661137bd1fb3c6bbb6e7c0d61c2d ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: OSPToolkit: OSPToolkit-4.2.0.tar.gz
Files fetched: 1 STORED: http://downloads.sourceforge.net/osp-toolkit/OSPToolkit-4.2.0.tar.gz edb0ac6d84cf6da0f0406f3d356b6204 OSPToolkit-4.2.0.tar.gz Size: 410372 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: OSPToolkit: ERRORS: OSPToolkit-4.2.0.tar.gz
wget -nv --no-check-certificate --user-agent=PLD/distfiles -O ./tmp/907fda50-ba2e-40ba-bb07-c03b5a581812/edb0ac6d84cf6da0f0406f3d356b6204/OSPToolkit-4.2.0.tar.gz http://dl.sourceforge.net/osp-toolkit/OSPToolkit-4.2.0.tar.gz: exited with code 4 (0x00) FATAL: http://dl.sourceforge.net/osp-toolkit/OSPToolkit-4.2.0.tar.gz (edb0ac6d84cf6da0f0406f3d356b6204) was not fetched correctly (wget -nv --no-check-certificate --user-agent=PLD/distfiles -O ./tmp/907fda50-ba2e-40ba-bb07-c03b5a581812/edb0ac6d84cf6da0f0406f3d356b6204/OSPToolkit-4.2.0.tar.gz http://dl.sourceforge.net/osp-toolkit/OSPToolkit-4.2.0.tar.gz: ): file fetched but has 0 length Files fetched: 0 -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: ERROR fetching sources for Usage (refs/heads/master)
cannot git fetch Usage from branch refs/heads/master; fatal: remote error: access denied or repository not exported: /packages/Usage exited with code 128 -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: OSPToolkit: ERRORS: OSPToolkit-4.2.0.tar.gz
wget -nv --no-check-certificate --user-agent=PLD/distfiles -O ./tmp/4a457e40-2bab-49d6-b79f-42b9ff057995/edb0ac6d84cf6da0f0406f3d356b6204/OSPToolkit-4.2.0.tar.gz http://dl.sourceforge.net/osp-toolkit/OSPToolkit-4.2.0.tar.gz: exited with code 4 (0x00) FATAL: http://dl.sourceforge.net/osp-toolkit/OSPToolkit-4.2.0.tar.gz (edb0ac6d84cf6da0f0406f3d356b6204) was not fetched correctly (wget -nv --no-check-certificate --user-agent=PLD/distfiles -O ./tmp/4a457e40-2bab-49d6-b79f-42b9ff057995/edb0ac6d84cf6da0f0406f3d356b6204/OSPToolkit-4.2.0.tar.gz http://dl.sourceforge.net/osp-toolkit/OSPToolkit-4.2.0.tar.gz: ): file fetched but has 0 length Files fetched: 0 -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/pjproject] make -j1
commit 49f97888eb7bad7c389303aae5870f4faf3f3f47 Author: Jacek Konieczny Date: Tue Jan 7 14:49:17 2014 +0100 make -j1 pjproject.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/pjproject.spec b/pjproject.spec index faed2a5..2c68e78 100644 --- a/pjproject.spec +++ b/pjproject.spec @@ -112,12 +112,12 @@ Statyczna biblioteka %{name}. --with-external-speex \ --with-external-srtp \ --with-external-gsm -%{__make} +%{__make} -j1 %install rm -rf $RPM_BUILD_ROOT -%{__make} install \ +%{__make} -j1 install \ DESTDIR=$RPM_BUILD_ROOT %clean gitweb: http://git.pld-linux.org/gitweb.cgi/packages/pjproject.git/commitdiff/49f97888eb7bad7c389303aae5870f4faf3f3f47 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: pjproject: 217740d99457fc8492d3a68f90fa25a52bd8eca9.tar.gz
Files fetched: 1 STORED: https://github.com/asterisk/pjproject/archive/217740d99457fc8492d3a68f90fa25a52bd8eca9.tar.gz b1d94fedf46f00b7e9fbaf8fa44cc652 217740d99457fc8492d3a68f90fa25a52bd8eca9.tar.gz Size: 5190498 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/pjproject] new package
commit fafdac2cc518f1ae74847341d67e89abeb88b1e7 Author: Jacek Konieczny Date: Tue Jan 7 14:12:23 2014 +0100 new package pjproject-avcodec.patch | 45 pjproject-ilbc-link.patch | 12 +++ pjproject.spec| 184 ++ 3 files changed, 241 insertions(+) --- diff --git a/pjproject.spec b/pjproject.spec new file mode 100644 index 000..faed2a5 --- /dev/null +++ b/pjproject.spec @@ -0,0 +1,184 @@ +# +# NOTE: +# this is a Digium fork of pjproject, for Asterisk +# https://wiki.asterisk.org/wiki/display/AST/Installing+pjproject +# we should switch to upstream when the needed changes are merged there +# +# +# TODO: +# - fix --with opencore_amr +# - libresample.so conflicts with the libresample-devel package +# + +# Conditional build: +%bcond_without sound # disable sound support (recommended by AST wiki) +%bcond_withresample# disable resample support (recommended by AST wiki) +%bcond_withopencore_amr# disable opencore-arm support (recommended by AST wiki) + +# from ./version.mak +%define version_base 2.1.0 + +# from a commit at https://github.com/asterisk/pjproject +%define snap_ts 20131114 +%define snap_hash 217740d99457fc8492d3a68f90fa25a52bd8eca9 + +Summary: PJSIP - free and open source multimedia communication library +Name: pjproject +Version: 2.1.0_digium_%{snap_ts} +Release: 0.1 +License: GPL v2+ +Group: Libraries +Source0: https://github.com/asterisk/pjproject/archive/%{snap_hash}.tar.gz +# Source0-md5: b1d94fedf46f00b7e9fbaf8fa44cc652 +Patch0:%{name}-avcodec.patch +Patch1:%{name}-ilbc-link.patch +URL: http://www.pjsip.org/ +%{?with_video:BuildRequires: SDL2-devel} +BuildRequires: SILK_SDK-devel +BuildRequires: autoconf +%{?with_video:BuildRequires: ffmpeg-devel} +BuildRequires: libgsm-devel +%{?with_video:BuildRequires: libv4l-devel} +%{?with_opencore_amr:BuildRequires:opencore-amr-devel} +BuildRequires: openssl-devel +BuildRequires: pkgconfig +%{?with_sound:BuildRequires: portaudio-devel} +BuildRequires: python-modules +BuildRequires: rpmbuild(macros) >= 1.583 +BuildRequires: speex-devel +BuildRequires: srtp-devel +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +# dependency loop between libpjmedia-videodev.so and libpjmedia.so +%defineskip_post_check_so libpjmedia-videodev.so.* + +%definelibsuffix %{_arch}-pld-linux-gnu + +%description +PJSIP is a free and open source multimedia communication library +written in C language implementing standard based protocols such as +SIP, SDP, RTP, STUN, TURN, and ICE. It combines signaling protocol +(SIP) with rich multimedia framework and NAT traversal functionality +into high level API that is portable and suitable for almost any type +of systems ranging from desktops, embedded systems, to mobile +handsets. + +PJSIP is both compact and feature rich. It supports audio, video, +presence, and instant messaging, and has extensive documentation. +PJSIP is very portable. On mobile devices, it abstracts system +dependent features and in many cases is able to utilize the native +multimedia capabilities of the device. + +%package devel +Summary: Header files for %{name} library +Summary(pl.UTF-8): Pliki nagłówkowe biblioteki %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Header files for %{name} library. + +%description devel -l pl.UTF-8 +Pliki nagłówkowe biblioteki %{name}. + +%package static +Summary: Static %{name} library +Summary(pl.UTF-8): Statyczna biblioteka %{name} +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +Static %{name} library. + +%description static -l pl.UTF-8 +Statyczna biblioteka %{name}. + +%prep +%setup -q -n %{name}-%{snap_hash} +%patch0 -p1 +%patch1 -p1 + +%build +%{__autoconf} -o configure aconfigure.ac + +%configure \ + CFLAGS="%{rpmcflags} %{?with_video:-DPJMEDIA_HAS_VIDEO=1}" \ + --enable-shared \ + %{__enable_disable sound sound} \ + %{__enable_disable video video} \ + %{__enable_disable resample resample} \ + %{__enable_disable opencore_amr opencore-amr} \ + %{__with sound external-pa} \ + --with-external-speex \ + --with-external-srtp \ + --with-external-gsm +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun-p /sbin/ldconfig + +%files +%defattr(644,root,root,755) +%doc README.txt +%attr(755,root,root) %{_libdir}/libg7221codec.so.2 +%attr(755,root,root) %{_libdir}/libilbccodec.so.2 +%attr(755,root,root) %{_libdir}/libmilenage.so.2 +%attr(755,root,root) %{_libdir}/libpj.so.2 +%attr(755,root,root) %{_libdir}/libp
[packages/pjproject] Created branch master
The branch 'master' was created. Summary of new commits: fafdac2... new package ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/idnkit] - ghost symlink - rel 6
commit cbb1308be52e1b75bd1c6a9de19313a4ce6a6c02 Author: Witold Filipczyk Date: Tue Jan 7 13:04:10 2014 +0100 - ghost symlink - rel 6 idnkit.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- diff --git a/idnkit.spec b/idnkit.spec index 7a983b2..90afa35 100644 --- a/idnkit.spec +++ b/idnkit.spec @@ -2,7 +2,7 @@ Summary:idnkit - internationalized domain name toolkit Summary(pl.UTF-8): idnkit - zestaw narzędzi do umiędzynarodowionych nazw domen Name: idnkit Version: 1.0 -Release: 5 +Release: 6 License: BSD-like Group: Libraries Source0: http://www.nic.ad.jp/ja/idn/idnkit/download/sources/%{name}-%{version}-src.tar.gz @@ -89,6 +89,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/idnconv %attr(755,root,root) %{_bindir}/runidn %attr(755,root,root) %{_libdir}/libidnkit*.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libidnkit*.so.1 # this one is used by runidn %{_libdir}/libidnkitres.la %dir %{_datadir}/idnkit gitweb: http://git.pld-linux.org/gitweb.cgi/packages/idnkit.git/commitdiff/cbb1308be52e1b75bd1c6a9de19313a4ce6a6c02 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/tomcat] handle access log logging as well
commit 40c59dd3f0aca00ac9acd53e756d4a6cb32d660d Author: Elan Ruusamäe Date: Tue Jan 7 13:57:23 2014 +0200 handle access log logging as well logging.patch | 12 tomcat.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) --- diff --git a/tomcat.spec b/tomcat.spec index 39754f3..bc3b5ce 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -13,7 +13,7 @@ Summary: Web server and Servlet/JSP Engine, RI for Servlet %{servletapiver}/JSP Summary(pl.UTF-8): Serwer www i silnik Servlet/JSP będący wzorcową implementacją API Servlet %{servletapiver}/JSP %{jspapiver} Name: tomcat Version: 7.0.41 -Release: 7 +Release: 8 License: Apache v2.0 Group: Networking/Daemons/Java Source0: http://www.apache.org/dist/tomcat/tomcat-7/v%{version}/src/apache-%{name}-%{version}-src.tar.gz diff --git a/logging.patch b/logging.patch index 57898ae..9042ffe 100644 --- a/logging.patch +++ b/logging.patch @@ -27,3 +27,15 @@ java.util.logging.ConsoleHandler.level = FINE java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter +--- apache-tomcat-7.0.41-src/conf/server.xml~ 2014-01-07 13:53:41.0 +0200 apache-tomcat-7.0.41-src/conf/server.xml 2014-01-07 13:55:47.637678314 +0200 +@@ -175,8 +175,7 @@ + Documentation at: /docs/config/valve.html + Note: The pattern used is equivalent to using pattern="common" --> + ++ pattern="combined" prefix="access_log" rotatable="false"/> + + + gitweb: http://git.pld-linux.org/gitweb.cgi/packages/tomcat.git/commitdiff/40c59dd3f0aca00ac9acd53e756d4a6cb32d660d ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/gtkmathview] - added gcc47.patch - BR: pangox-compat-devel - ghost symlink - rel 9
commit 119f9ab3190015a100c438245537453fa597d44d Author: Witold Filipczyk Date: Tue Jan 7 12:24:47 2014 +0100 - added gcc47.patch - BR: pangox-compat-devel - ghost symlink - rel 9 gtkmathview.spec | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) --- diff --git a/gtkmathview.spec b/gtkmathview.spec index 97401a7..0e39e3d 100644 --- a/gtkmathview.spec +++ b/gtkmathview.spec @@ -2,7 +2,7 @@ Summary:A GTK+ viewer to view MathML documents Summary(pl.UTF-8): Przeglądarka dokumentów MathML dla GTK+ Name: gtkmathview Version: 0.8.0 -Release: 8 +Release: 9 License: LGPL v3+ Group: X11/Applications/Graphics Source0: http://helm.cs.unibo.it/mml-widget/sources/%{name}-%{version}.tar.gz @@ -10,6 +10,7 @@ Source0: http://helm.cs.unibo.it/mml-widget/sources/%{name}-%{version}.tar.gz Patch0:%{name}-no_static_viewer.patch Patch1:%{name}-gcc.patch Patch2:gcc44.patch +Patch3:gcc47.patch URL: http://helm.cs.unibo.it/mml-widget/ BuildRequires: autoconf >= 2.50 BuildRequires: automake @@ -18,6 +19,7 @@ BuildRequires:gtk+2-devel >= 1:2.10.0 BuildRequires: libstdc++-devel BuildRequires: libtool >= 2:1.5 BuildRequires: libxml2-devel >= 1:2.6.26 +BuildRequires: pangox-compat-devel BuildRequires: pkgconfig BuildRequires: popt-devel BuildRequires: t1lib-x-devel >= 1.2 @@ -77,6 +79,7 @@ Wersja statyczna bibliotek dla GTK+ do renderowania dokumentów MathML. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # AM_BINRELOC missing, just ignore echo 'AC_DEFUN([AM_BINRELOC], [])' > acinclude.m4 @@ -119,6 +122,7 @@ rm -rf $RPM_BUILD_ROOT %files libs %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/lib*.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/lib*.so.? %dir %{_sysconfdir}/gtkmathview %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gtkmathview/gtkmathview.conf.xml gitweb: http://git.pld-linux.org/gitweb.cgi/packages/gtkmathview.git/commitdiff/119f9ab3190015a100c438245537453fa597d44d ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/gtkmathview] - compilation fix, taken from Fedora
commit 9831dd2b0533d6fd4167723e9b450a806219e6bd Author: Witold Filipczyk Date: Tue Jan 7 12:24:08 2014 +0100 - compilation fix, taken from Fedora gcc47.patch | 66 + 1 file changed, 66 insertions(+) --- diff --git a/gcc47.patch b/gcc47.patch new file mode 100644 index 000..33615c6 --- /dev/null +++ b/gcc47.patch @@ -0,0 +1,66 @@ +diff -up gtkmathview-0.8.0/mathmlps/main.cc.gcc47 gtkmathview-0.8.0/mathmlps/main.cc +--- gtkmathview-0.8.0/mathmlps/main.cc.gcc47 2012-02-27 13:12:01.218602317 -0500 gtkmathview-0.8.0/mathmlps/main.cc 2012-02-27 13:12:06.59679 -0500 +@@ -21,6 +21,13 @@ + #include + #include + #include ++#ifdef __linux__ ++/* to get getopt on Linux */ ++#ifndef __USE_POSIX2 ++#define __USE_POSIX2 ++#endif ++#endif ++#include + + #include + +diff -up gtkmathview-0.8.0/mathmlsvg/main.cc.gcc47 gtkmathview-0.8.0/mathmlsvg/main.cc +--- gtkmathview-0.8.0/mathmlsvg/main.cc.gcc47 2012-02-27 13:10:33.335366105 -0500 gtkmathview-0.8.0/mathmlsvg/main.cc2012-02-27 13:10:33.374365766 -0500 +@@ -21,6 +21,13 @@ + #include + #include + #include ++#ifdef __linux__ ++/* to get getopt on Linux */ ++#ifndef __USE_POSIX2 ++#define __USE_POSIX2 ++#endif ++#endif ++#include + + #include + +diff -up gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh.gcc47 gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh +--- gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh.gcc47 2007-08-17 06:02:34.0 -0400 gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh 2012-02-27 13:10:33.376365750 -0500 +@@ -47,12 +47,13 @@ protected: + SmartPtr + getElement(const typename Model::Element& el) const + { +-if (SmartPtr elem = smart_cast(linkerAssoc(el))) ++SmartPtr elem; ++if (elem = smart_cast(this->linkerAssoc(el))) + return elem; + else + { +- SmartPtr elem = ElementBuilder::type::create(ElementBuilder::getContext(*this)); +- linkerAdd(el, elem); ++ elem = ElementBuilder::type::create(ElementBuilder::getContext(*this)); ++ this->linkerAdd(el, elem); + return elem; + } + } +diff -up gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh.gcc47 gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh +--- gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh.gcc47 2007-08-17 06:02:34.0 -0400 gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh 2012-02-27 13:10:33.377365741 -0500 +@@ -43,7 +43,7 @@ protected: + findValidNodeForward(const typename Model::Node& p0) const + { + for (typename Model::Node p = p0; p; p = Model::getNextSibling(p)) +- if (valid(p)) return Model::asElement(p); ++ if (this->valid(p)) return Model::asElement(p); + return typename Model::Element(); + } + gitweb: http://git.pld-linux.org/gitweb.cgi/packages/gtkmathview.git/commitdiff/119f9ab3190015a100c438245537453fa597d44d ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: OSPToolkit: ERRORS: OSPToolkit-4.2.0.tar.gz
wget -nv --no-check-certificate --user-agent=PLD/distfiles -O ./tmp/90a3af6d-d550-4d83-b162-af8ee9264faa/edb0ac6d84cf6da0f0406f3d356b6204/OSPToolkit-4.2.0.tar.gz http://dl.sourceforge.net/osp-toolkit/OSPToolkit-4.2.0.tar.gz: exited with code 4 (0x00) FATAL: http://dl.sourceforge.net/osp-toolkit/OSPToolkit-4.2.0.tar.gz (edb0ac6d84cf6da0f0406f3d356b6204) was not fetched correctly (wget -nv --no-check-certificate --user-agent=PLD/distfiles -O ./tmp/90a3af6d-d550-4d83-b162-af8ee9264faa/edb0ac6d84cf6da0f0406f3d356b6204/OSPToolkit-4.2.0.tar.gz http://dl.sourceforge.net/osp-toolkit/OSPToolkit-4.2.0.tar.gz: ): file fetched but has 0 length Files fetched: 0 -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/OSPToolkit] Version: 4.2.0
commit aa7ae6bfbfdb937f8f7c06841dbd64476aaea3d8 Author: Jacek Konieczny Date: Tue Jan 7 11:07:40 2014 +0100 Version: 4.2.0 OSPToolkit.spec | 8 1 file changed, 4 insertions(+), 4 deletions(-) --- diff --git a/OSPToolkit.spec b/OSPToolkit.spec index ed55670..5686a0c 100644 --- a/OSPToolkit.spec +++ b/OSPToolkit.spec @@ -1,14 +1,14 @@ Summary: Implementation of the ETSI OSP VoIP Peering protocol Summary(pl.UTF-8): Implementacja protokołu ETSI OSP VoIP Peering Name: OSPToolkit -Version: 3.6.1 +Version: 4.2.0 Release: 1 License: BSD Group: Libraries Source0: http://dl.sourceforge.net/osp-toolkit/%{name}-%{version}.tar.gz -# Source0-md5: 9ce96429bd1e7644db6733cca22f63c6 +# Source0-md5: edb0ac6d84cf6da0f0406f3d356b6204 Patch0:sharedlib.patch -URL: http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit.htm +URL: http://www.freerouteserver.com/index.php/osp-toolkit BuildRequires: openssl-devel BuildRequires: sed >= 4.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -54,7 +54,7 @@ Static OSP Toolkit library. Statyczna biblioteka OSP Toolkit. %prep -%setup -q -n TK-%(echo %{version} | tr . _)-20100107 +%setup -q -n TK-%(echo %{version} | tr . _)-20131014 %patch0 -p1 %{__sed} -i -e 's,\$(INSTALL_PATH)/lib,$(INSTALL_PATH)/%{_lib},' src/Makefile gitweb: http://git.pld-linux.org/gitweb.cgi/packages/OSPToolkit.git/commitdiff/aa7ae6bfbfdb937f8f7c06841dbd64476aaea3d8 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/cgminer] Use system jansson
commit e7bb96eb39e273e8dbfdbc28af95cb580bbb0e36 Author: Jacek Konieczny Date: Tue Jan 7 10:38:30 2014 +0100 Use system jansson cgminer-system-jansson.patch | 62 cgminer.spec | 14 ++ 2 files changed, 71 insertions(+), 5 deletions(-) --- diff --git a/cgminer.spec b/cgminer.spec index 1b2fe9e..377ca96 100644 --- a/cgminer.spec +++ b/cgminer.spec @@ -1,14 +1,17 @@ -# TODO -devel subpackage Summary: FPGA/ASIC Miner by Con Kolivas Name: cgminer Version: 3.8.3 -Release: 1 +Release: 2 License: GPL v2 Group: Applications/Networking URL: http://forum.bitcoin.org/index.php?topic=28402.0 Source0: http://ck.kolivas.org/apps/cgminer/%{name}-%{version}.tar.bz2 # Source0-md5: ec70aee505fa3e8d9cbe566a65d420cb +Patch0:%{name}-system-jansson.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: curl-devel +BuildRequires: jansson-devel BuildRequires: libusb-devel BuildRequires: ncurses-devel BuildRequires: pkgconfig >= 0.9.0 @@ -21,10 +24,13 @@ This is a miner for Bitcoin. %prep %setup -q +%patch0 -p1 %build -%{__aclocal} +%{__aclocal} -I m4 %{__autoconf} +%{__autoheader} +%{__automake} %configure \ CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses" \ --disable-silent-rules \ @@ -63,8 +69,6 @@ rm -rf $RPM_BUILD_ROOT %doc API-README ASIC-README AUTHORS FPGA-README %doc NEWS README %attr(755,root,root) %{_bindir}/%{name} -%attr(755,root,root) %{_libdir}/libjansson.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libjansson.so.4 %dir %{_libdir}/%{name} %attr(755,root,root) %{_libdir}/%{name}/%{name} %{_libdir}/%{name}/bitstreams diff --git a/cgminer-system-jansson.patch b/cgminer-system-jansson.patch new file mode 100644 index 000..3e2e2d9 --- /dev/null +++ b/cgminer-system-jansson.patch @@ -0,0 +1,62 @@ +diff -dur cgminer-3.8.3.orig/Makefile.am cgminer-3.8.3/Makefile.am +--- cgminer-3.8.3.orig/Makefile.am 2013-11-22 13:52:57.0 +0100 cgminer-3.8.3/Makefile.am 2014-01-07 10:36:06.0 +0100 +@@ -1,8 +1,6 @@ + + ACLOCAL_AMFLAGS = -I m4 + +-JANSSON_INCLUDES= -I$(top_builddir)/compat/jansson-2.5/src -I$(top_srcdir)/compat/jansson-2.5/src +- + if WANT_USBUTILS + USBUTILS_INCLUDES = -I$(top_builddir)/compat/libusb-1.0/libusb -I$(top_srcdir)/compat/libusb-1.0/libusb + else +@@ -18,7 +16,7 @@ + + SUBDIRS = lib compat ccan + +-INCLUDES = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_INCLUDES) $(USBUTILS_INCLUDES) ++INCLUDES = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_CFLAGS) $(USBUTILS_INCLUDES) + + bin_PROGRAMS = cgminer + +diff -dur cgminer-3.8.3.orig/compat/Makefile.am cgminer-3.8.3/compat/Makefile.am +--- cgminer-3.8.3.orig/compat/Makefile.am 2013-11-17 23:13:00.0 +0100 cgminer-3.8.3/compat/Makefile.am 2014-01-07 10:36:15.0 +0100 +@@ -1,5 +1,5 @@ + +-SUBDIRS = jansson-2.5 ++SUBDIRS = + + if WANT_USBUTILS + if WANT_STATIC_LIBUSB +Only in cgminer-3.8.3/compat: Makefile.am~ +diff -dur cgminer-3.8.3.orig/configure.ac cgminer-3.8.3/configure.ac +--- cgminer-3.8.3.orig/configure.ac2013-11-23 00:32:53.0 +0100 cgminer-3.8.3/configure.ac 2014-01-07 10:36:06.0 +0100 +@@ -308,9 +308,6 @@ + + AM_CONDITIONAL([WANT_STATIC_LIBUSB], [test x$dlibusb = xno]) + +-AC_CONFIG_SUBDIRS([compat/jansson-2.5]) +-JANSSON_LIBS="compat/jansson-2.5/src/.libs/libjansson.a" +- + PKG_PROG_PKG_CONFIG() + + if test "x$have_cgminer_sdk" = "xtrue"; then +@@ -331,6 +328,8 @@ + [libcurl=$enableval] + ) + ++PKG_CHECK_MODULES([JANSSON], [jansson >= 2.5]) ++ + if test "x$libcurl" != xno; then + if test "x$have_win32" != xtrue; then + PKG_CHECK_MODULES([LIBCURL], [libcurl >= 7.25.0], [AC_DEFINE([CURL_HAS_KEEPALIVE], [1], [Defined if version of curl supports keepalive.])], +@@ -400,6 +399,7 @@ + + + AC_SUBST(JANSSON_LIBS) ++AC_SUBST(JANSSON_CFLAGS) + AC_SUBST(PTHREAD_FLAGS) + AC_SUBST(DLOPEN_FLAGS) + AC_SUBST(PTHREAD_LIBS) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/cgminer.git/commitdiff/e7bb96eb39e273e8dbfdbc28af95cb580bbb0e36 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/jansson] Source0-md5 added
commit 2b1113f06420520eed97b82e73f01f5c42636780 Author: Jacek Konieczny Date: Tue Jan 7 10:26:55 2014 +0100 Source0-md5 added jansson.spec | 1 + 1 file changed, 1 insertion(+) --- diff --git a/jansson.spec b/jansson.spec index 1089f5b..ed9cbd7 100644 --- a/jansson.spec +++ b/jansson.spec @@ -10,6 +10,7 @@ Release: 1 License: MIT Group: Libraries Source0: http://www.digip.org/jansson/releases/%{name}-%{version}.tar.gz +# Source0-md5: 46ac93bec48aacf207b67b51c8fbf7f1 URL: http://www.digip.org/jansson/ BuildRequires: autoconf BuildRequires: automake gitweb: http://git.pld-linux.org/gitweb.cgi/packages/jansson.git/commitdiff/2b1113f06420520eed97b82e73f01f5c42636780 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: jansson: jansson-2.5.tar.gz
Files fetched: 1 STORED: http://www.digip.org/jansson/releases/jansson-2.5.tar.gz 46ac93bec48aacf207b67b51c8fbf7f1 jansson-2.5.tar.gz Size: 408185 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/jansson] Created branch master
The branch 'master' was created. Summary of new commits: 388247c... new package ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/jansson] new package
commit 388247c20e9d23448fd46bfc836d3e9eb5cf8182 Author: Jacek Konieczny Date: Tue Jan 7 10:16:12 2014 +0100 new package jansson.spec | 118 +++ 1 file changed, 118 insertions(+) --- diff --git a/jansson.spec b/jansson.spec new file mode 100644 index 000..1089f5b --- /dev/null +++ b/jansson.spec @@ -0,0 +1,118 @@ +# +# Conditional build: +%bcond_without apidocs # do not build and package API docs +%bcond_without static_libs # don't build static libraries +# +Summary: C library for encoding, decoding and manipulating JSON data +Name: jansson +Version: 2.5 +Release: 1 +License: MIT +Group: Libraries +Source0: http://www.digip.org/jansson/releases/%{name}-%{version}.tar.gz +URL: http://www.digip.org/jansson/ +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +%{?with_apidocs:BuildRequires:sphinx-pdg} +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Jansson is a C library for encoding, decoding and manipulating JSON +data. It features: + +- Simple and intuitive API and data model +- Comprehensive documentation +- No dependencies on other libraries +- Full Unicode support (UTF-8) +- Extensive test suite + +%package devel +Summary: Header files for %{name} library +Summary(pl.UTF-8): Pliki nagłówkowe biblioteki %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Header files for %{name} library. + +%description devel -l pl.UTF-8 +Pliki nagłówkowe biblioteki %{name}. + +%package static +Summary: Static %{name} library +Summary(pl.UTF-8): Statyczna biblioteka %{name} +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +Static %{name} library. + +%description static -l pl.UTF-8 +Statyczna biblioteka %{name}. + +%package apidocs +Summary: %{name} API documentation +Summary(pl.UTF-8): Dokumentacja API biblioteki %{name} +Group: Documentation + +%description apidocs +API and internal documentation for %{name} library. + +%description apidocs -l pl.UTF-8 +Dokumentacja API biblioteki %{name}. + +%prep +%setup -q + +%build +%{__libtoolize} +%{__aclocal} +%{__autoconf} +%{__autoheader} +%{__automake} +%configure \ + %{!?with_static_libs:--disable-static} +%{__make} + +%if %{with apidocs} +%{__make} -C doc html +%endif + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +rm $RPM_BUILD_ROOT/%{_libdir}/lib%{name}.la + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun-p /sbin/ldconfig + +%files +%defattr(644,root,root,755) +%doc CHANGES README.rst +%attr(755,root,root) %{_libdir}/lib%{name}.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/lib%{name}.so.4 + +%files devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/lib%{name}.so +%{_includedir}/%{name}*.h +%{_pkgconfigdir}/%{name}.pc + +%if %{with static_libs} +%files static +%defattr(644,root,root,755) +%{_libdir}/lib%{name}.a +%endif + +%if %{with apidocs} +%files apidocs +%defattr(644,root,root,755) +%doc doc/_build/html +%endif gitweb: http://git.pld-linux.org/gitweb.cgi/packages/jansson.git/commitdiff/388247c20e9d23448fd46bfc836d3e9eb5cf8182 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: asterisk: asterisk-12.0.0.tar.gz
Files fetched: 1 STORED: http://downloads.digium.com/pub/asterisk/releases/asterisk-12.0.0.tar.gz 1226dabeba5637e6114936ea9e916b88 asterisk-12.0.0.tar.gz Size: 56595630 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/asterisk/ASTERISK_12: 2/2] Drop bristuff crap
commit b178e80935b40998662a7843f22e6f5f22980604 Author: Jacek Konieczny Date: Tue Jan 7 09:16:56 2014 +0100 Drop bristuff crap Hardware-specific Asterisk patches are evil and Bristuff is neither supported or needed for current Asterisks. asterisk.spec | 24 +--- 1 file changed, 1 insertion(+), 23 deletions(-) --- diff --git a/asterisk.spec b/asterisk.spec index 40fde5e..2530a18 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -26,7 +26,6 @@ %bcond_withzhone # zhone hack %bcond_withzhone_hack # huge hack workarounding broken zhone channel banks which start randomly # issuing pulse-dialled calls to weird numbers -%bcond_withbristuff# BRIstuff (Junghanns.NET BRI adapters) support %bcond_withmisdn # chan_misdn requires ancient mISDN (1.x) %bcond_withopenais # openais is dead project %bcond_without h323# without h323 support @@ -39,7 +38,7 @@ Summary: Asterisk PBX Summary(pl.UTF-8): Centralka (PBX) Asterisk Name: asterisk Version: 12.0.0 -Release: %{rel}%{?with_bristuff:.bristuff} +Release: %{rel} License: GPL v2 Group: Applications/System Source0: http://downloads.digium.com/pub/asterisk/releases/%{name}-%{version}.tar.gz @@ -66,10 +65,6 @@ Patch9: pld-banner.patch # http://soft-switch.org/downloads/spandsp/spandsp-%{spandsp_version}/asterisk-1.2.x/apps_Makefile.patch Patch10: %{name}-txfax-Makefile.patch Patch12: %{name}-zhone.patch -# http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff -Patch13: %{name}-bristuff.patch -Patch14: %{name}-bristuff-build.patch -Patch15: %{name}-bristuff-libpri.patch Patch16: lpc10-system.patch Patch17: gsm-libpoison.patch Patch18: Fix-history-loading-when-using-external-libedit.patch @@ -139,12 +134,7 @@ BuildRequires: srtp-devel BuildRequires: unixODBC-devel BuildRequires: xorg-lib-libX11-devel BuildRequires: zlib-devel -%if %{with bristuff} -BuildRequires: libgsmat-devel -BuildRequires: libpri-bristuff-devel >= 1.2.4 -%else BuildRequires: libpri-devel >= 1.4.6 -%endif %if %{with fc} BuildRequires: libss7-devel >= 1.0.1 BuildRequires: libtool-ltdl-devel @@ -557,11 +547,6 @@ cp %{SOURCE10} . cp %{SOURCE11} . %endif %{?with_zhonehack:%patch12 -p1} -%if %{with bristuff} -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%endif %patch16 -p1 #%patch17 -p1 %patch18 -p1 @@ -606,16 +591,12 @@ cd menuselect cd .. %configure \ - %{?with_bristuff:--with-gsmat=%{_prefix}} \ --with-imap=system \ --with-gsm=/usr \ %{!?with_h323:--without-h323} \ --with-lpc10=/usr \ --with-libedit=yes -# safe checks -%{?with_bristuff:grep '^#define HAVE_GSMAT 1' include/asterisk/autoconfig.h || exit 1} - cp -f .cleancount .lastclean %{__make} DEBUG= \ @@ -671,9 +652,6 @@ touch apps/app_voicemail.so apps/app_directory.so %{?with_verbose:NOISY_BUILD=yes} \ %endif -# safe checks -%{?with_bristuff:objdump -p channels/chan_zap.so | grep -qE 'NEEDED +libgsmat\.so' || exit 1} - %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{/var/{log/asterisk/cdr-csv,spool/asterisk/monitor},/etc/{rc.d/init.d,sysconfig,logrotate.d}} \ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/asterisk.git/commitdiff/b178e80935b40998662a7843f22e6f5f22980604 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/asterisk] (2 commits) Created branch ASTERISK_12
The branch 'ASTERISK_12' was created. Summary of new commits: 334d264... start update to Asterisk 12 b178e80... Drop bristuff crap ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/asterisk/ASTERISK_12: 1/2] start update to Asterisk 12
commit 334d264b7e0f7b83feee45f74ac2418b1e1d1511 Author: Jacek Konieczny Date: Tue Jan 7 09:15:17 2014 +0100 start update to Asterisk 12 asterisk.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/asterisk.spec b/asterisk.spec index 0e5d390..40fde5e 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -34,16 +34,16 @@ %bcond_without verbose # verbose build %definespandsp_version 0.0.2pre26 -%definerel 1 +%definerel 0.1 Summary: Asterisk PBX Summary(pl.UTF-8): Centralka (PBX) Asterisk Name: asterisk -Version: 10.12.2 +Version: 12.0.0 Release: %{rel}%{?with_bristuff:.bristuff} License: GPL v2 Group: Applications/System Source0: http://downloads.digium.com/pub/asterisk/releases/%{name}-%{version}.tar.gz -# Source0-md5: 7831ea3015d17bddeecce86c126192e2 +# Source0-md5: 1226dabeba5637e6114936ea9e916b88 Source1: %{name}.init Source2: %{name}.sysconfig Source3: %{name}.tmpfiles gitweb: http://git.pld-linux.org/gitweb.cgi/packages/asterisk.git/commitdiff/b178e80935b40998662a7843f22e6f5f22980604 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: libcap: libcap-2.24.tar.xz
Files fetched: 1 STORED: https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.24.tar.xz d43ab9f680435a7fff35b4ace8d45b80 libcap-2.24.tar.xz Size: 63412 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/libcap] - 2.24
commit 9a831902af3d5fd737ac58d66cb0a21bde1b9ce2 Author: Paweł Gołaszewski Date: Tue Jan 7 09:02:58 2014 +0100 - 2.24 libcap.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/libcap.spec b/libcap.spec index 909dd26..2b68b91 100644 --- a/libcap.spec +++ b/libcap.spec @@ -2,13 +2,13 @@ Summary: POSIX.1e capability suite Summary(pl.UTF-8): Wsparcie dla standardu "capability" POSIX.1e Summary(pt_BR.UTF-8): Biblioteca para leitura e configuração de capabilities. Name: libcap -Version: 2.23 +Version: 2.24 Release: 1 Epoch: 1 License: GPL v2 or BSD Group: Applications/System Source0: https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/%{name}-%{version}.tar.xz -# Source0-md5: 09a185e4b0aa8a81a51c1e4d0eba7db0 +# Source0-md5: d43ab9f680435a7fff35b4ace8d45b80 Patch0:%{name}-make.patch URL: https://sites.google.com/site/fullycapable/ BuildRequires: attr-devel gitweb: http://git.pld-linux.org/gitweb.cgi/packages/libcap.git/commitdiff/9a831902af3d5fd737ac58d66cb0a21bde1b9ce2 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit