DISTFILES: ejabberd: ejabberd-2.1.12.tgz ejabberd-module-pgsql-1105.tar.bz2
Files fetched: 1 STORED: http://www.process-one.net/downloads/ejabberd/2.1.12/ejabberd-2.1.12.tgz 7d49242cf04282f3c4cebfafa2cc2f46 ejabberd-2.1.12.tgz Size: 1999224 bytes ALREADY GOT: no-url://ejabberd-module-pgsql-1105.tar.bz2 7a8ba920a508f5180284699610789c14 ejabberd-module-pgsql-1105.tar.bz2 -- 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/openssl] - rel 2; add debian fixes
commit 84745a0c3e028225ed6345956c6f4a3c777c Author: Arkadiusz Miśkiewicz ar...@maven.pl Date: Fri May 17 09:10:45 2013 +0200 - rel 2; add debian fixes aesni-mac.patch | 26 cpuid.patch | 27 default_bits.patch| 11 dtls_version.patch| 25 get_certificate.patch | 27 openssl.spec | 20 +- pic.patch | 175 ++ stddef.patch | 12 8 files changed, 322 insertions(+), 1 deletion(-) --- diff --git a/openssl.spec b/openssl.spec index 932f8ff..40a65e9 100644 --- a/openssl.spec +++ b/openssl.spec @@ -17,7 +17,7 @@ Summary(ru.UTF-8):Библиотеки и утилиты для соедине Summary(uk.UTF-8): Бібліотеки та утиліти для з'єднань через Secure Sockets Layer Name: openssl Version: 1.0.1e -Release: 1 +Release: 2 License: Apache-like Group: Libraries Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz @@ -33,6 +33,16 @@ Patch4: %{name}-man-namespace.patch Patch5:%{name}-asflag.patch Patch6:%{name}-ca-certificates.patch Patch7:%{name}-ldflags.patch + +# from debian +Patch10: aesni-mac.patch +Patch11: cpuid.patch +Patch12: default_bits.patch +Patch13: dtls_version.patch +Patch14: get_certificate.patch +Patch15: pic.patch +Patch16: stddef.patch + URL: http://www.openssl.org/ BuildRequires: bc BuildRequires: perl-devel = 1:5.6.1 @@ -245,6 +255,14 @@ RC4, RSA и SSL. Включает статические библиотеки д %patch6 -p1 %patch7 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 + sed -i -e 's|\$prefix/\$libdir/engines|/%{_lib}/engines|g' Configure %build diff --git a/aesni-mac.patch b/aesni-mac.patch new file mode 100644 index 000..7bb5345 --- /dev/null +++ b/aesni-mac.patch @@ -0,0 +1,26 @@ +From: Andy Polyakov ap...@openssl.org +Date: Mon, 18 Mar 2013 19:29:41 +0100 +Subject: e_aes_cbc_hmac_sha1.c: fix rare bad record mac on AES-NI plaforms. +Origin: upstream: http://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=9ab3ce124616cb12bd39c6aa1e1bde0f46969b29 +Bug-Debian: http://bugs.debian.org/701868 +Bug: http://rt.openssl.org/Ticket/Display.html?id=3002user=guestpass=guest + +diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c +index 483e04b..fb2c884 100644 +--- a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c +@@ -328,10 +328,11 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, + + if (res!=SHA_CBLOCK) continue; + +- mask = 0-((inp_len+8-j)(sizeof(j)*8-1)); ++ /* j is not incremented yet */ ++ mask = 0-((inp_len+7-j)(sizeof(j)*8-1)); + data-u[SHA_LBLOCK-1] |= bitlenmask; + sha1_block_data_order(key-md,data,1); +- mask = 0-((j-inp_len-73)(sizeof(j)*8-1)); ++ mask = 0-((j-inp_len-72)(sizeof(j)*8-1)); + pmac-u[0] |= key-md.h0 mask; + pmac-u[1] |= key-md.h1 mask; + pmac-u[2] |= key-md.h2 mask; + diff --git a/cpuid.patch b/cpuid.patch new file mode 100644 index 000..4e37491 --- /dev/null +++ b/cpuid.patch @@ -0,0 +1,27 @@ +From: Andy Polyakov ap...@openssl.org +Date: Mon, 4 Mar 2013 19:05:04 + (+0100) +Subject: x86cpuid.pl: make it work with older CPUs. +Origin: upstream: http://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=5702e965d759dde8a098d8108660721ba2b93a7d +Bug-Debian: http://bugs.debian.org/699692 +Bug: http://rt.openssl.org/Ticket/Display.html?id=3005user=guestpass=guest + +diff --git a/crypto/x86cpuid.pl b/crypto/x86cpuid.pl +index 3b6c469..e8a7518 100644 +--- a/crypto/x86cpuid.pl b/crypto/x86cpuid.pl +@@ -69,6 +69,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } + inc(esi);# number of cores + + mov(eax,1); ++ xor(ecx,ecx); + cpuid (); + bt (edx,28); + jnc(label(generic)); +@@ -102,6 +103,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } + + set_label(nocacheinfo); + mov(eax,1); ++ xor(ecx,ecx); + cpuid (); + and(edx,0xbfef); # force reserved bits #20, #30 to 0 + cmp(ebp,0); diff --git a/default_bits.patch b/default_bits.patch new file mode 100644 index 000..8e7e416 --- /dev/null +++ b/default_bits.patch @@ -0,0 +1,11 @@ +--- openssl/apps/openssl.cnf 2012-06-06 00:51:47.0 +0200 openssl/apps/openssl.cnf 2012-06-06 00:53:48.0 +0200 +@@ -105,7 +105,7 @@ + +
[packages/python-PyGreSQL] Version: 4.1.1
commit 562d4db3ed0d7e34a41464f129fadfd15f90e8ba Author: Jacek Konieczny j.koniec...@eggsoft.pl Date: Fri May 17 09:18:21 2013 +0200 Version: 4.1.1 python-PyGreSQL.spec | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) --- diff --git a/python-PyGreSQL.spec b/python-PyGreSQL.spec index cdf27b9..fee4faf 100644 --- a/python-PyGreSQL.spec +++ b/python-PyGreSQL.spec @@ -1,16 +1,16 @@ Summary: PostgreSQL module for Python Summary(pl.UTF-8): Moduł PostgreSQL dla Pythona Name: python-PyGreSQL -Version: 4.0 -Release: 2 +Version: 4.1.1 +Release: 1 License: BSD-like Group: Libraries/Python -Source0: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-%{version}.tgz -# Source0-md5: 1aca50e59ff4cc56abe9452a9a49c5ff +Source0: http://www.pygresql.org/files/PyGreSQL-%{version}.tgz +# Source0-md5: 71d0b8c5a382f635572eb52fee47cd08 URL: http://www.pygresql.org/ BuildRequires: postgresql-backend-devel BuildRequires: postgresql-devel -BuildRequires: python-devel = 1:2.5 +BuildRequires: python-devel = 1:2.6 BuildRequires: rpm-pythonprov %pyrequires_eq python Obsoletes: python-postgresql gitweb: http://git.pld-linux.org/gitweb.cgi/packages/python-PyGreSQL.git/commitdiff/562d4db3ed0d7e34a41464f129fadfd15f90e8ba ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: python-PyGreSQL: PyGreSQL-4.1.1.tgz
Files fetched: 1 STORED: http://www.pygresql.org/files/PyGreSQL-4.1.1.tgz 71d0b8c5a382f635572eb52fee47cd08 PyGreSQL-4.1.1.tgz Size: 100883 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-psycopg2] Version: 2.5
commit 1ce530467b1f50bcaf65cded30b93cb9500d4e45 Author: Jacek Konieczny j.koniec...@eggsoft.pl Date: Fri May 17 09:45:33 2013 +0200 Version: 2.5 - up to 2.5 - python3 support added python-psycopg2.spec | 76 ++-- 1 file changed, 68 insertions(+), 8 deletions(-) --- diff --git a/python-psycopg2.spec b/python-psycopg2.spec index 462710c..26e8165 100644 --- a/python-psycopg2.spec +++ b/python-psycopg2.spec @@ -2,25 +2,34 @@ # todo: # - lib64 patch -%definemodule psycopg2 +# Conditional build: +%bcond_without python2 # CPython 2.x module +%bcond_without python3 # CPython 3.x module +%definemodule psycopg2 Summary: psycopg is a PostgreSQL database adapter for Python Summary(pl.UTF-8): psycopg jest przeznaczonym dla Pythona interfejsem do bazy PostgreSQL Name: python-%{module} -Version: 2.4.4 +Version: 2.5 Release: 1 License: GPL Group: Libraries/Python -Source0: http://initd.org/psycopg/tarballs/PSYCOPG-2-4/%{module}-%{version}.tar.gz -# Source0-md5: 331255d2d44018bcef2ea192aabc1d6a +Source0: http://initd.org/psycopg/tarballs/PSYCOPG-2-5/%{module}-%{version}.tar.gz +# Source0-md5: facd82faa067e99b80146a0ee2f842f6 #Patch0: %{name}-lib64.patch URL: http://www.initd.org/software/psycopg/ BuildRequires: autoconf BuildRequires: postgresql-backend-devel BuildRequires: postgresql-devel -BuildRequires: python-devel +%if %{with python2} +BuildRequires: python-devel = 2.5 +%endif +%if %{with python3} +BuildRequires: python3-devel = 2.5 +%endif BuildRequires: rpm-pythonprov Requires: postgresql-libs +%if %{with python2} Requires: python-modules %if %{pld_release} == ac BuildRequires: python-mx-DateTime-devel @@ -36,6 +45,11 @@ Requires:python-mx-DateTime BuildConflicts: python-egenix-mx-base %endif Requires: python-pytz +%endif +%if %{with python3} +Requires: python3-modules +Requires: python3-pytz +%endif BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -52,6 +66,26 @@ z założeniem że ma być bardzo mały, szybki i stabilny. Główna zaletą psycopg jest, że w jest pełni zgodny z standardem DBAPI-2.0 i jest 'thread safe' na poziomie 2. +%package -n python3-%{module} +Summary: psycopg is a PostgreSQL database adapter for Python +Summary(pl.UTF-8): psycopg jest przeznaczonym dla Pythona interfejsem do bazy PostgreSQL +Group: Libraries/Python + +%description -n python3-%{module} +psycopg is a PostgreSQL database adapter for the Python programming +language (just like pygresql and popy.) It was written from scratch +with the aim of being very small and fast, and stable as a rock. The +main advantages of psycopg are that it supports the full Python +DBAPI-2.0 and being thread safe at level 2. + +%description -n python3-%{module} -l pl.UTF-8 +psycopg jest przeznaczonym dla Pythona interfejsem do bazy danych +PostgreSQL (tak jak pygresql i popy). Został zakodowany od początku +z założeniem że ma być bardzo mały, szybki i stabilny. Główna zaletą +psycopg jest, że w jest pełni zgodny z standardem DBAPI-2.0 i jest +'thread safe' na poziomie 2. + + %prep %setup -q -n %{module}-%{version} #%if %{_lib} == lib64 @@ -59,25 +93,51 @@ psycopg jest, że w jest pełni zgodny z standardem DBAPI-2.0 i jest #%endif %build -python setup.py build +%if %{with python2} +%{__python} setup.py build +%endif +%if %{with python3} +%{__python3} setup.py build +%endif %install rm -rf $RPM_BUILD_ROOT -python setup.py install --optimize=2 --root=$RPM_BUILD_ROOT +%if %{with python2} +%{__python} setup.py install --optimize=2 --root=$RPM_BUILD_ROOT # find $RPM_BUILD_ROOT%{py_libdir} -type f -name *.py | xargs rm %py_postclean +%endif +%if %{with python3} +%{__python3} setup.py install --optimize=2 --root=$RPM_BUILD_ROOT +%endif %clean rm -rf $RPM_BUILD_ROOT +%if %{with python2} %files %defattr(644,root,root,755) -%doc ChangeLog AUTHORS README doc/HACKING doc/SUCCESS +%doc NEWS AUTHORS README doc/HACKING doc/SUCCESS %dir %{py_sitedir}/%{module} %attr(755,root,root) %{py_sitedir}/%{module}/*.so %{py_sitedir}/%{module}/*.py[co] %if %{pld_release} != ac %{py_sitedir}/*.egg-info %endif +%{py_sitedir}/%{module}/tests +%endif + +%if %{with python3} +%files -n python3-%{module} +%defattr(644,root,root,755) +%doc NEWS AUTHORS README doc/HACKING doc/SUCCESS +%dir %{py3_sitedir}/%{module} +%dir %{py3_sitedir}/%{module}/__pycache__ +%attr(755,root,root) %{py3_sitedir}/%{module}/*.so +%{py3_sitedir}/%{module}/*.py +%{py3_sitedir}/%{module}/__pycache__/*.py* +%{py3_sitedir}/*.egg-info +%{py3_sitedir}/%{module}/tests +%endif gitweb: http://git.pld-linux.org/gitweb.cgi/packages/python-psycopg2.git/commitdiff/1ce530467b1f50bcaf65cded30b93cb9500d4e45
DISTFILES: python-psycopg2: psycopg2-2.5.tar.gz
Files fetched: 1 STORED: http://initd.org/psycopg/tarballs/PSYCOPG-2-5/psycopg2-2.5.tar.gz facd82faa067e99b80146a0ee2f842f6 psycopg2-2.5.tar.gz Size: 703558 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/ipython] Version: 0.13.2
commit 489490f218686eaf61f1c09835b07f9d922fb7ba Author: Jacek Konieczny j.koniec...@eggsoft.pl Date: Fri May 17 09:59:02 2013 +0200 Version: 0.13.2 ipython.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/ipython.spec b/ipython.spec index 10b67a8..0eea8be 100644 --- a/ipython.spec +++ b/ipython.spec @@ -8,12 +8,12 @@ Summary: An enhanced Interactive Python shell Summary(pl.UTF-8): Interaktywna powłoka języka Python Name: ipython -Version: 0.13.1 +Version: 0.13.2 Release: 1 License: BSD Group: Applications/Shells Source0: http://archive.ipython.org/release/%{version}/%{name}-%{version}.tar.gz -# Source0-md5: ca7e75f7c802afc6aaa0a1ea59846420 +# Source0-md5: ead3b7eb70c653b537fb9d96d71b8b2a URL: http://ipython.org BuildRequires: pydoc BuildRequires: python-devel = 2.6 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ipython.git/commitdiff/489490f218686eaf61f1c09835b07f9d922fb7ba ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/vim] up to 7.3.961
commit 51290b4b04e09f9214ce3e63c532fa46f06e3b39 Author: Elan Ruusamäe g...@delfi.ee Date: Fri May 17 11:10:29 2013 +0300 up to 7.3.961 7.3.961 tests 86 and 87 fail when using another language than English sources | 1 + vim.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) --- diff --git a/vim.spec b/vim.spec index 8fc2614..bfe1c09 100644 --- a/vim.spec +++ b/vim.spec @@ -26,7 +26,7 @@ # tail -n1 sources | awk '{print $2}' %definever 7.3 -%definepatchlevel 960 +%definepatchlevel 961 %definerel 1 Summary: Vi IMproved - a Vi clone Summary(de.UTF-8): VIsual editor iMproved diff --git a/sources b/sources index 5dcbfdf..4c62bd1 100644 --- a/sources +++ b/sources @@ -957,3 +957,4 @@ cf024ba52a4948717647e034fa07f9e2 7.3.953 d0097745598c818f73ba6323ee474db0 7.3.958 49cbf46f153ddb7100ad37786a9de2b9 7.3.959 e1538bc0bdd92306b6e42da41f7e46b7 7.3.960 +ebab08ad3827c66a75d47f626e2fb05e 7.3.961 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/vim.git/commitdiff/51290b4b04e09f9214ce3e63c532fa46f06e3b39 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/kernel/LINUX_3_7] - ressurect pc speaker driver
commit 7348f5ef39e0d469227c26a3e588d5a473f95c86 Author: Arkadiusz Miśkiewicz ar...@maven.pl Date: Fri May 17 10:21:31 2013 +0200 - ressurect pc speaker driver kernel-multiarch.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/kernel-multiarch.config b/kernel-multiarch.config index 38d213d..d00f088 100644 --- a/kernel-multiarch.config +++ b/kernel-multiarch.config @@ -8686,7 +8686,7 @@ SND_OPL4_LIB alpha=m i386=m SND_VX_LIB all=m SND_AC97_CODEC all=m SND_DRIVERS all=n -SND_PCSP all=n +SND_PCSP all=m SND_DUMMY all=m SND_VIRMIDI all=m SND_MTPAV all=m gitweb: http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/7348f5ef39e0d469227c26a3e588d5a473f95c86 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/kernel] - ressurect pc speaker driver
commit 1906d14e6d11f414bb9c9ce8919cddab020b2272 Author: Arkadiusz Miśkiewicz ar...@maven.pl Date: Fri May 17 10:23:28 2013 +0200 - ressurect pc speaker driver kernel-multiarch.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/kernel-multiarch.config b/kernel-multiarch.config index 3bfa9a2..758ee4a 100644 --- a/kernel-multiarch.config +++ b/kernel-multiarch.config @@ -8776,7 +8776,7 @@ SND_OPL4_LIB alpha=m i386=m SND_VX_LIB all=m SND_AC97_CODEC all=m SND_DRIVERS all=n -SND_PCSP all=n +SND_PCSP all=y SND_DUMMY all=m SND_VIRMIDI all=m SND_MTPAV all=m gitweb: http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/1906d14e6d11f414bb9c9ce8919cddab020b2272 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/kmod] - rel 2; blacklist snd-pcsp (speaker) driver
commit 0fa500b73ad2fc897ccc04fddba31ebe89484175 Author: Arkadiusz Miśkiewicz ar...@maven.pl Date: Fri May 17 10:24:40 2013 +0200 - rel 2; blacklist snd-pcsp (speaker) driver kmod-blacklist | 3 +++ kmod.spec | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) --- diff --git a/kmod.spec b/kmod.spec index c89a03f..0f0f7c9 100644 --- a/kmod.spec +++ b/kmod.spec @@ -5,7 +5,7 @@ Summary:Linux kernel module handling Summary(pl.UTF-8): Obsługa modułów jądra Linuksa Name: kmod Version: 13 -Release: 1 +Release: 2 License: GPL v2+ Group: Applications/System Source0: ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%{name}-%{version}.tar.xz diff --git a/kmod-blacklist b/kmod-blacklist index 7543796..954a2d8 100644 --- a/kmod-blacklist +++ b/kmod-blacklist @@ -2,3 +2,6 @@ # evbug module shouldn't be loaded by default: blacklist evbug + +# pc speaker +blacklist snd-pcsp gitweb: http://git.pld-linux.org/gitweb.cgi/packages/kmod.git/commitdiff/0fa500b73ad2fc897ccc04fddba31ebe89484175 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/perl-HTML-Tree] - release 2 (by relup.sh)
commit 19e1642e8deedc8a5673bfe3708af31b1ae3cdc5 Author: Marcin Krol h...@tld-linux.org Date: Fri May 17 09:07:07 2013 + - release 2 (by relup.sh) perl-HTML-Tree.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/perl-HTML-Tree.spec b/perl-HTML-Tree.spec index dadeba6..6ec9c2d 100644 --- a/perl-HTML-Tree.spec +++ b/perl-HTML-Tree.spec @@ -9,7 +9,7 @@ Summary:A suite for making parse trees out of HTML source Summary(pl.UTF-8): Pakiet do tworzenie przetworzonych drzew źródła w HTML-u Name: perl-HTML-Tree Version: 5.03 -Release: 1 +Release: 2 # same as perl License: GPL v1+ or Artistic Group: Development/Languages/Perl gitweb: http://git.pld-linux.org/gitweb.cgi/packages/perl-HTML-Tree.git/commitdiff/19e1642e8deedc8a5673bfe3708af31b1ae3cdc5 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php-pecl-memcache] - updated to 3.0.8
commit cae44e68c028d4a68ed79575bdc5eeb0f8f32f04 Author: Marcin Krol h...@tld-linux.org Date: Fri May 17 09:12:48 2013 + - updated to 3.0.8 php-pecl-memcache.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec index 477a8c0..f451d1f 100644 --- a/php-pecl-memcache.spec +++ b/php-pecl-memcache.spec @@ -4,12 +4,12 @@ Summary: %{modname} - a memcached extension Summary(pl.UTF-8): %{modname} - rozszerzenie memcached Name: php-pecl-%{modname} -Version: 3.0.6 -Release: 8 +Version: 3.0.8 +Release: 1 License: PHP 3.01 Group: Development/Languages/PHP Source0: http://pecl.php.net/get/%{modname}-%{version}.tgz -# Source0-md5: 23c2a1548f3fc7658b98b1c60e6d83b1 +# Source0-md5: 24505e9b263d2c77f8ae5e9b4725e7d1 Source1: %{modname}.ini Source2: %{modname}-apache.conf Source3: %{modname}-lighttpd.conf gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcache.git/commitdiff/cae44e68c028d4a68ed79575bdc5eeb0f8f32f04 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: php-pecl-memcache: memcache-3.0.8.tgz
Files fetched: 1 STORED: http://pecl.php.net/get/memcache-3.0.8.tgz 24505e9b263d2c77f8ae5e9b4725e7d1 memcache-3.0.8.tgz Size: 70523 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/ipython3] BR: python3-distribute
commit 48114c05c5e4bcf4dca4751deac0b3c41d238d47 Author: Jacek Konieczny j.koniec...@eggsoft.pl Date: Fri May 17 11:05:18 2013 +0200 BR: python3-distribute ipython3.spec | 1 + 1 file changed, 1 insertion(+) --- diff --git a/ipython3.spec b/ipython3.spec index c280f64..8a546e5 100644 --- a/ipython3.spec +++ b/ipython3.spec @@ -16,6 +16,7 @@ URL: http://ipython.org BuildRequires: pydoc3 BuildRequires: python3-devel BuildRequires: python3-devel-tools +BuildRequires: python3-distribute BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) = 1.219 Requires: python3-%{mname} = %{version}-%{release} gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ipython3.git/commitdiff/48114c05c5e4bcf4dca4751deac0b3c41d238d47 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/darktable] - up to 1.2
commit c15f409ff86b291957d20a5b1c86330c95c760c5 Author: Lukasz Glebicki ble...@pld-linux.org Date: Fri May 17 11:12:19 2013 +0200 - up to 1.2 darktable.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/darktable.spec b/darktable.spec index f4f4697..132e37c 100644 --- a/darktable.spec +++ b/darktable.spec @@ -5,12 +5,12 @@ Summary: darktable is a virtual lighttable and darkroom for photographers Summary(pl.UTF-8): darktable to wirtualny podświetlany stół i ciemnia dla fotografów Name: darktable -Version: 1.1.4 -Release: 2 +Version: 1.2 +Release: 1 License: GPL v3 Group: X11/Applications/Graphics Source0: http://downloads.sourceforge.net/darktable/%{name}-%{version}.tar.xz -# Source0-md5: 49e376ca4b88f5351acacef177285c45 +# Source0-md5: 31bfd13d4786aac4f99d5155a811602b Patch0:cmake-glib.patch Patch1:openexr2.patch URL: http://darktable.sourceforge.net/ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/darktable.git/commitdiff/c15f409ff86b291957d20a5b1c86330c95c760c5 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: darktable: darktable-1.2.tar.xz
Files fetched: 1 STORED: http://downloads.sourceforge.net/darktable/darktable-1.2.tar.xz 31bfd13d4786aac4f99d5155a811602b darktable-1.2.tar.xz Size: 2399856 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/qt] - release 5 (by relup.sh)
commit 1487e986bae99004405622e8382a731f0b90a30d Author: Marcin Krol h...@tld-linux.org Date: Fri May 17 09:48:20 2013 + - release 5 (by relup.sh) qt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/qt.spec b/qt.spec index 2a9eccf..6346339 100644 --- a/qt.spec +++ b/qt.spec @@ -28,7 +28,7 @@ Summary(pl.UTF-8):Biblioteka Qt3 do tworzenia GUI Summary(pt_BR.UTF-8): Estrutura para rodar aplicações GUI Qt Name: qt Version: %{ver} -Release: 4 +Release: 5 Epoch: 6 License: QPL v1, GPL v2 or GPL v3 Group: X11/Libraries gitweb: http://git.pld-linux.org/gitweb.cgi/packages/qt.git/commitdiff/1487e986bae99004405622e8382a731f0b90a30d ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/redmine] - migrated to apache 2.4
commit 79dbe49d58221c58d6f17bde5e73cc94b2c76472 Author: Jan Rękorajski bagg...@pld-linux.org Date: Fri May 17 11:26:03 2013 +0200 - migrated to apache 2.4 redmine.conf | 2 +- redmine.spec | 7 --- 2 files changed, 5 insertions(+), 4 deletions(-) --- diff --git a/redmine.spec b/redmine.spec index f5cccd3..d6cba9a 100644 --- a/redmine.spec +++ b/redmine.spec @@ -6,7 +6,7 @@ Summary: Flexible project management web application Name: redmine Version: 1.3.2 -Release: 4 +Release: 5 License: GPL v2 Group: Applications/WWW Source0: http://rubyforge.org/frs/download.php/75910/%{name}-%{version}.tar.gz @@ -51,6 +51,7 @@ Suggests: ruby-mysql-library Suggests: ruby-openid = 2.1.4 Suggests: subversion = 1.3 Provides: user(redmine) +Conflicts: apache-base 2.4.0-1 # Does not work AT ALL with rails 3 currently Conflicts: ruby-rails = 3.0 BuildArch: noarch @@ -205,11 +206,11 @@ if [ $1 = 0 ]; then %userremove redmine fi -%triggerin -- apache 2.2.0, apache-base +%triggerin -- apache-base %webapp_register httpd %{_webapp} %addusertogroup -q redmine http -%triggerun -- apache 2.2.0, apache-base +%triggerun -- apache-base %webapp_unregister httpd %{_webapp} %files diff --git a/redmine.conf b/redmine.conf index e6811ee..ff19741 100644 --- a/redmine.conf +++ b/redmine.conf @@ -4,7 +4,7 @@ Alias /redmine /usr/share/redmine/public # Neither mod_ruby nor cgi/fcgi work reliably with ruby 1.9/rails 2.3 Directory /usr/share/redmine/public - Allow from all + Require all granted Options -MultiViews RailsBaseURI /redmine gitweb: http://git.pld-linux.org/gitweb.cgi/packages/redmine.git/commitdiff/79dbe49d58221c58d6f17bde5e73cc94b2c76472 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/roundcubemail] - migrated to apache 2.4
commit 864f8de1126e536a79b68ceb733076ebb182c06d Author: Jan Rękorajski bagg...@pld-linux.org Date: Fri May 17 11:28:13 2013 +0200 - migrated to apache 2.4 httpd.conf | 66 ++ roundcubemail.spec | 10 + 2 files changed, 72 insertions(+), 4 deletions(-) --- diff --git a/roundcubemail.spec b/roundcubemail.spec index 1cf0a3c..265ca93 100644 --- a/roundcubemail.spec +++ b/roundcubemail.spec @@ -16,7 +16,7 @@ Summary: RoundCube Webmail Summary(pl.UTF-8): RoundCube Webmail - poczta przez WWW Name: roundcubemail Version: 0.8.6 -Release: 1 +Release: 2 License: GPL v3+ Group: Applications/Mail Source0: http://downloads.sourceforge.net/roundcubemail/%{name}-%{version}-dep.tar.gz @@ -27,6 +27,7 @@ Source3: lighttpd.conf Source4: http://nejc.skoberne.net/wp-content/uploads/2008/11/rcpfa-105.tgz # Source4-md5: dc23bcd894f693db74fce53b09ab58d6 Source5: find-lang.sh +Source6: httpd.conf Patch0:%{name}-config.patch Patch1:%{name}-spam.patch Patch2:%{name}-postfixadmin-pl_locales.patch @@ -78,6 +79,7 @@ Suggests: php-pear-Net_Socket Suggests: php-xml Obsoletes: roundcube-plugin-jqueryui Obsoletes: roundcubemail-skin-default +Conflicts: apache-base 2.4.0-1 Conflicts: logrotate 3.8.0 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -252,7 +254,7 @@ ln -sf %{_sysconfdir}/db.inc.php $RPM_BUILD_ROOT%{_appdir}/config/db.inc.php ln -sf %{_sysconfdir}/main.inc.php $RPM_BUILD_ROOT%{_appdir}/config/main.inc.php cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf -cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf +cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/%{name} @@ -336,10 +338,10 @@ EOF %triggerun -- apache1 1.3.37-3, apache1-base %webapp_unregister apache %{_webapp} -%triggerin -- apache 2.2.0, apache-base +%triggerin -- apache-base %webapp_register httpd %{_webapp} -%triggerun -- apache 2.2.0, apache-base +%triggerun -- apache-base %webapp_unregister httpd %{_webapp} %triggerin -- lighttpd diff --git a/httpd.conf b/httpd.conf new file mode 100644 index 000..b37a15f --- /dev/null +++ b/httpd.conf @@ -0,0 +1,66 @@ +Alias /roundcube /usr/share/roundcube +Directory /usr/share/roundcube + AddDefaultCharset UTF-8 + php_admin_value open_basedir /usr/share/roundcube:/usr/share/pear:/usr/share/php:/usr/share/misc:/var/lib/roundcube:/var/log/roundcube:/etc/webapps/roundcube:/etc/mail:/tmp + + FilesMatch (\.inc|\~)$|^_ + Require all denied + /FilesMatch + + Require all granted + + php_flagdisplay_errors Off + php_flaglog_errors On + # php_value error_log logs/errors + + php_value upload_max_filesize 5M + php_value post_max_size 6M + php_value memory_limit64M + + php_flagzlib.output_compression Off + php_flagmagic_quotes_gpcOff + php_flagmagic_quotes_runtimeOff + php_flagzend.ze1_compatibility_mode Off + php_flagsuhosin.session.encrypt Off + + #php_value session.cookie_path / + php_flagsession.auto_start Off + php_value session.gc_maxlifetime 21600 + php_value session.gc_divisor 500 + php_value session.gc_probability 1 + + # http://bugs.php.net/bug.php?id=30766 + php_value mbstring.func_overload 0 + + IfModule mod_rewrite.c + RewriteEngine On + RewriteRule ^favicon.ico$ skins/default/images/favicon.ico + # security rules + RewriteRule .svn/ - [F] + RewriteRule ^README|INSTALL|LICENSE|SQL|bin|CHANGELOG$ - [F] + /IfModule + + IfModule mod_deflate.c + SetOutputFilter DEFLATE + /IfModule + + IfModule mod_headers.c + # replace 'append' with 'merge' for Apache version 2.2.9 and later + #Header append Cache-Control public env=!NO_CACHE + /IfModule + + IfModule mod_expires.c + ExpiresActive On + ExpiresDefault access plus 1 month + /IfModule + + FileETag MTime Size + + IfModule mod_autoindex.c + Options -Indexes + /ifModule +/Directory + +Directory /usr/share/roundcube/config + Require all denied +/Directory gitweb: http://git.pld-linux.org/gitweb.cgi/packages/roundcubemail.git/commitdiff/864f8de1126e536a79b68ceb733076ebb182c06d
[packages/rt] - migrated to apache 2.4
commit d6f85e286af58299557ee5673738ac7cf2f5da54 Author: Jan Rękorajski bagg...@pld-linux.org Date: Fri May 17 11:31:53 2013 +0200 - migrated to apache 2.4 rt-apache.conf | 5 ++--- rt.spec| 7 --- 2 files changed, 6 insertions(+), 6 deletions(-) --- diff --git a/rt.spec b/rt.spec index 0e2886a..3c9db5a 100644 --- a/rt.spec +++ b/rt.spec @@ -42,7 +42,7 @@ Summary: Request Tracker Summary(pl.UTF-8): Request Tracker - system do śledzenia zleceń Name: rt Version: 4.0.12 -Release: 1 +Release: 2 License: GPL v2 Group: Applications Source0: http://download.bestpractical.com/pub/rt/release/%{name}-%{version}.tar.gz @@ -202,6 +202,7 @@ Requires: perl-XML-RSS = %{perl_xml_rss_ver} Requires: perl-base = %{perl_ver} Requires: webapps Suggests: perl-FCGI +Conflicts: apache-base 2.4.0-1 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -299,10 +300,10 @@ rm -r $RPM_BUILD_ROOT%{_datadir}/fonts/TTF # *.in, tests find $RPM_BUILD_ROOT -type f -name \*.in -exec rm '{}' \; -%triggerin -- apache 2.2.0, apache-base +%triggerin -- apache-base %webapp_register httpd %{_webapp} -%triggerun -- apache 2.2.0, apache-base +%triggerun -- apache-base %webapp_unregister httpd %{_webapp} %clean diff --git a/rt-apache.conf b/rt-apache.conf index 63ecdf8..308189d 100644 --- a/rt-apache.conf +++ b/rt-apache.conf @@ -1,9 +1,8 @@ Directory /usr/share/rt/html AllowOverride all - #ExecCGI on + #ExecCGI on IfModule mod_authz_host.c - Order allow,deny - Allow from all + Require all granted /IfModule /Directory gitweb: http://git.pld-linux.org/gitweb.cgi/packages/rt.git/commitdiff/d6f85e286af58299557ee5673738ac7cf2f5da54 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/smokeping] - migrated to apache 2.4
commit bbd49942e880be4a8faad737ef9d5b700e12aea6 Author: Jan Rękorajski bagg...@pld-linux.org Date: Fri May 17 11:33:49 2013 +0200 - migrated to apache 2.4 smokeping.conf = smokeping-apache.conf | 0 smokeping-httpd.conf| 22 ++ smokeping.spec | 12 +++- 3 files changed, 29 insertions(+), 5 deletions(-) --- diff --git a/smokeping.spec b/smokeping.spec index dba9bca..3add827 100644 --- a/smokeping.spec +++ b/smokeping.spec @@ -3,16 +3,17 @@ Summary: Smokeping - a latency grapher that uses rrdtool Summary(pl.UTF-8): Smokeping - narzędzie do tworzenia wykresów opóźnień sieci Name: smokeping Version: 2.4.2 -Release: 10 +Release: 11 License: GPL v2+ Group: Networking/Utilities Source0: http://oss.oetiker.ch/smokeping/pub/%{name}-%{version}.tar.gz # Source0-md5: eb8e7679fcad35e59d7c51f2328250a2 Source1: %{name}.init -Source2: %{name}.conf +Source2: %{name}-apache.conf Source3: %{name}-config Source4: %{name}-lighttpd.conf Source5: %{name}.tmpfiles +Source6: %{name}-httpd.conf URL: http://oss.oetiker.ch/smokeping/ BuildRequires: perl-tools-pod BuildRequires: rpm-perlprov = 4.1-13 @@ -80,6 +81,7 @@ Requires: webapps Requires: webserver(access) Requires: webserver(alias) Requires: webserver(cgi) +Conflicts: apache-base 2.4.0-1 %description cgi CGI webinterface for smokeping. @@ -132,8 +134,8 @@ install htdocs/smokeping.cgi.dist $RPM_BUILD_ROOT%{_cgi_bindir}/smokeping.cgi install htdocs/tr.cgi.dist $RPM_BUILD_ROOT%{_cgi_bindir}/tr.cgi cp -r lib/* $RPM_BUILD_ROOT%{_datadir}/%{name} install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} -install %{SOURCE2} $RPM_BUILD_ROOT%{_wwwconfdir}/httpd.conf install %{SOURCE2} $RPM_BUILD_ROOT%{_wwwconfdir}/apache.conf +install %{SOURCE6} $RPM_BUILD_ROOT%{_wwwconfdir}/httpd.conf install %{SOURCE4} $RPM_BUILD_ROOT%{_wwwconfdir}/lighttpd.conf install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/config install doc/*.1 $RPM_BUILD_ROOT%{_mandir}/man1 @@ -173,10 +175,10 @@ fi %triggerun cgi -- apache1 1.3.37-3, apache1-base %webapp_unregister apache %{_webapp} -%triggerin cgi -- apache 2.2.0, apache-base +%triggerin cgi -- apache-base %webapp_register httpd %{_webapp} -%triggerun cgi -- apache 2.2.0, apache-base +%triggerun cgi -- apache-base %webapp_unregister httpd %{_webapp} %triggerin cgi -- lighttpd diff --git a/smokeping.conf b/smokeping-apache.conf similarity index 100% rename from smokeping.conf rename to smokeping-apache.conf diff --git a/smokeping-httpd.conf b/smokeping-httpd.conf new file mode 100644 index 000..a3aa727 --- /dev/null +++ b/smokeping-httpd.conf @@ -0,0 +1,22 @@ +IfModule mod_alias.c +Alias /simg/ /var/lib/smokeping/img/ +Alias /smokeping/ /usr/share/smokeping/ +ScriptAlias /smokeping /usr/share/smokeping/smokeping.cgi + +IfModule mod_dir.c + Directory /usr/share/smokeping + DirectoryIndex /smokeping + /Directory +/IfModule +/IfModule + +Directory /usr/share/smokeping + Require all granted +# NOTE: in order to run smoketrace (tr.cgi via tr.html) uncomment lines below and give apache necessary permissions to run traceroute +# AddHandler cgi-script cgi +# Options ExecCGI +/Directory + +Directory /var/lib/smokeping/img + Require all granted +/Directory gitweb: http://git.pld-linux.org/gitweb.cgi/packages/smokeping.git/commitdiff/bbd49942e880be4a8faad737ef9d5b700e12aea6 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/squid] - migrated to apache 2.4
commit 61cf77cbe9ba85e4643d6d2cc0a67c22e129b497 Author: Jan Rękorajski bagg...@pld-linux.org Date: Fri May 17 11:36:15 2013 +0200 - migrated to apache 2.4 squid-cachemgr-httpd.conf | 5 + squid.spec| 10 ++ 2 files changed, 11 insertions(+), 4 deletions(-) --- diff --git a/squid.spec b/squid.spec index 97228b5..1695ccf 100644 --- a/squid.spec +++ b/squid.spec @@ -17,7 +17,7 @@ Summary(uk.UTF-8):Squid - кеш об'єктів Internet Summary(zh_CN.UTF-8): SQUID 高速缓冲代理服务器 Name: squid Version: 3.2.11 -Release: 1 +Release: 2 Epoch: 7 License: GPL v2 Group: Networking/Daemons @@ -32,6 +32,7 @@ Source5: %{name}.logrotate Source6: %{name}.pamd Source7: %{name}-cachemgr-apache.conf Source8: %{name}.tmpfiles +Source9: %{name}-cachemgr-httpd.conf Patch0:%{name}-fhs.patch Patch1:%{name}-location.patch Patch2:%{name}-crash-on-ENOSPC.patch @@ -202,6 +203,7 @@ Requires: webserver Requires: webserver(access) Requires: webserver(alias) Requires: webserver(cgi) +Conflicts: apache-base 2.4.0-1 %description cachemgr Cachemgr.cgi is a CGI script that allows administrator to check @@ -678,7 +680,7 @@ install %{SOURCE8} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/squid.conf %{__mv} -f $RPM_BUILD_ROOT%{_libdir}/squid/cachemgr.cgi $RPM_BUILD_ROOT%{_cgidir} %{__cp} -a %{SOURCE7} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf -%{__cp} -a %{SOURCE7} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf +%{__cp} -a %{SOURCE9} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf %{__rm} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/cachemgr.conf.default cd $RPM_BUILD_ROOT/etc/squid @@ -751,10 +753,10 @@ fi %triggerun cachemgr -- apache1 1.3.37-3, apache1-base %webapp_unregister apache %{_webapp} -%triggerin cachemgr -- apache 2.2.0, apache-base +%triggerin cachemgr -- apache-base %webapp_register httpd %{_webapp} -%triggerun cachemgr -- apache 2.2.0, apache-base +%triggerun cachemgr -- apache-base %webapp_unregister httpd %{_webapp} %triggerpostun -- cachemgr 7:3.0.STABLE10-0.2 diff --git a/squid-cachemgr-httpd.conf b/squid-cachemgr-httpd.conf new file mode 100644 index 000..622f815 --- /dev/null +++ b/squid-cachemgr-httpd.conf @@ -0,0 +1,5 @@ +ScriptAlias /cgi-bin/cachemgr.cgi /usr/lib/cgi-bin/cachemgr/cachemgr.cgi + +Directory /usr/lib/cgi-bin/cachemgr + Require all granted +/Directory gitweb: http://git.pld-linux.org/gitweb.cgi/packages/squid.git/commitdiff/61cf77cbe9ba85e4643d6d2cc0a67c22e129b497 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/squirrelmail] - migrated to apache 2.4
commit 3d4676dd358e1145f80a0b3d749da288011a6778 Author: Jan Rękorajski bagg...@pld-linux.org Date: Fri May 17 11:38:20 2013 +0200 - migrated to apache 2.4 squirrelmail.conf = squirrelmail-apache.conf | 0 squirrelmail-httpd.conf | 23 +++ squirrelmail.spec | 12 +++- 3 files changed, 30 insertions(+), 5 deletions(-) --- diff --git a/squirrelmail.spec b/squirrelmail.spec index 588fdb7..78d721b 100644 --- a/squirrelmail.spec +++ b/squirrelmail.spec @@ -3,7 +3,7 @@ Summary(pl.UTF-8): Wiewiórcza Poczta, Poczta przez WWW Summary(pt_BR.UTF-8): O SquirrelMail é um webmail Name: squirrelmail Version: 1.4.21 -Release: 3 +Release: 4 License: GPL v2+ Group: Applications/Mail Source0: http://dl.sourceforge.net/squirrelmail/%{name}-%{version}.tar.bz2 @@ -15,8 +15,9 @@ Source1: http://dl.sourceforge.net/squirrelmail/all_locales-%{locales_ver}-%{all %definecompatibility_ver 2.0.16-1.0 Source2: http://www.squirrelmail.org/plugins/compatibility-%{compatibility_ver}.tar.gz # Source2-md5: d472fb353cdf0c8d56489b5d5523d0dc -Source3: %{name}.conf +Source3: %{name}-apache.conf Source4: %{name}-cp1250_charset_encode.php +Source5: %{name}-httpd.conf Patch0:%{name}-config.patch Patch1:%{name}-squirrelspell.patch Patch2:%{name}-ad_ldap.patch @@ -34,6 +35,7 @@ Requires: webserver Requires: webserver(php) Provides: squirrelmail-compatibility = %{compatibility_ver} Provides: webmail +Conflicts: apache-base 2.4.0-1 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define_squirreldir%{_datadir}/%{name} @@ -169,8 +171,8 @@ install -d $RPM_BUILD_ROOT{%{_squirreldir}/{config,data},%{_sbindir}} \ install plugins/filters/bulkquery/bulkquery $RPM_BUILD_ROOT%{_sbindir} rm -f plugins/filters/bulkquery/*.{in,out,c} plugins/filters/bulkquery/bulkquery -install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf +install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf cp -aR * $RPM_BUILD_ROOT%{_squirreldir} @@ -205,10 +207,10 @@ rm -rf $RPM_BUILD_ROOT %triggerun -- apache1 1.3.37-3, apache1-base %webapp_unregister apache %{_webapp} -%triggerin -- apache 2.2.0, apache-base +%triggerin -- apache-base %webapp_register httpd %{_webapp} -%triggerun -- apache 2.2.0, apache-base +%triggerun -- apache-base %webapp_unregister httpd %{_webapp} %triggerpostun -- squirrelmail 1.4.5-4.1 diff --git a/squirrelmail.conf b/squirrelmail-apache.conf similarity index 100% rename from squirrelmail.conf rename to squirrelmail-apache.conf diff --git a/squirrelmail-httpd.conf b/squirrelmail-httpd.conf new file mode 100644 index 000..d0f6c79 --- /dev/null +++ b/squirrelmail-httpd.conf @@ -0,0 +1,23 @@ +Alias /mail /usr/share/squirrelmail + +# Redirect http to https. Required apache-mod_ssl and apache-mod_rewrite +#Location /mail +# RewriteEngine on +# RewriteCond %{HTTPS} !^on$ [NC] +# RewriteRule . https://%{SERVER_NAME}/mail/ [L] +#/Location + +# Redirect http to https. Required apache-mod_ssl +#VirtualHost 192.168.1.1:80 +# ServerName mail.example.org +# RedirectMatch ^/mail/$ https://mail.example.org/mail/ +#/VirtualHost + +Directory /usr/share/squirrelmail + Require all granted + php_admin_value open_basedir /etc/webapps/squirrelmail/:/etc/mail:/usr/share/squirrelmail/:/var/lib/squirrelmail/:/tmp +/Directory + +Directory /var/lib/squirrelmail + Require all granted +/Directory gitweb: http://git.pld-linux.org/gitweb.cgi/packages/squirrelmail.git/commitdiff/3d4676dd358e1145f80a0b3d749da288011a6778 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/tinymce] - migrated to apache 2.4
commit 87d065d5c4b7775b48e1179df2d07bbd3aa6c238 Author: Jan Rękorajski bagg...@pld-linux.org Date: Fri May 17 11:39:20 2013 +0200 - migrated to apache 2.4 tinymce.spec | 16 1 file changed, 12 insertions(+), 4 deletions(-) --- diff --git a/tinymce.spec b/tinymce.spec index 9a5db49..0c984d7 100644 --- a/tinymce.spec +++ b/tinymce.spec @@ -5,7 +5,7 @@ Summary:Web based Javascript HTML WYSIWYG editor control Summary(pl.UTF-8): Kontrolka edytora WYSIWYG HTML-a oparta na WWW z Javascriptem Name: tinymce Version: 3.2.7 -Release: 1 +Release: 2 License: LGPL v2 Group: Applications/WWW Source0: http://downloads.sourceforge.net/tinymce/%{name}_%{ver}.zip @@ -16,6 +16,7 @@ BuildRequires:sed = 4.0 BuildRequires: unzip Requires: webapps Requires: webserver(alias) +Conflicts: apache-base 2.4.0-1 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -85,6 +86,13 @@ Alias /tiny_mce/ %{_appdir}/ /Directory EOF +cat 'EOF' httpd.conf +Alias /tiny_mce/ %{_appdir}/ +Directory %{_appdir} + Require all granted +/Directory +EOF + cat lighttpd.conf 'EOF' alias.url += ( /tiny_mce/ = %{_appdir}/, @@ -99,7 +107,7 @@ cp -a example examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} cp -a jscripts/tiny_mce/* $RPM_BUILD_ROOT%{_appdir} cp -a apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf -cp -a apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf +cp -a httpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf cp -a lighttpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf %clean @@ -111,10 +119,10 @@ rm -rf $RPM_BUILD_ROOT %triggerun -- apache1 1.3.37-3, apache1-base %webapp_unregister apache %{_webapp} -%triggerin -- apache 2.2.0, apache-base +%triggerin -- apache-base %webapp_register httpd %{_webapp} -%triggerun -- apache 2.2.0, apache-base +%triggerun -- apache-base %webapp_unregister httpd %{_webapp} %triggerin -- lighttpd gitweb: http://git.pld-linux.org/gitweb.cgi/packages/tinymce.git/commitdiff/87d065d5c4b7775b48e1179df2d07bbd3aa6c238 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/trac] - migrated to apache 2.4
commit cd0e5f302ac524c57c242df8f86b04b7d157851f Author: Jan Rękorajski bagg...@pld-linux.org Date: Fri May 17 11:42:27 2013 +0200 - migrated to apache 2.4 trac-httpd.conf | 45 + trac.spec | 10 ++ 2 files changed, 51 insertions(+), 4 deletions(-) --- diff --git a/trac.spec b/trac.spec index 8404d6e..8368bc1 100644 --- a/trac.spec +++ b/trac.spec @@ -6,7 +6,7 @@ Summary(pl.UTF-8): Zintegrowane scm, wiki, system śledzenia problemów i środo Name: trac # NOTE 1.x is on DEVEL branch, finish it there and then merge Version: 0.12.5 -Release: 2 +Release: 3 License: BSD-like Group: Applications/WWW Source0: http://ftp.edgewall.com/pub/trac/Trac-%{version}.tar.gz @@ -17,6 +17,7 @@ Source3: %{name}.ico Source4: %{name}.ini Source5: %{name}-enableplugin.py Source6: %{name}-upgrade.py +Source7: %{name}-httpd.conf Patch0:%{name}-root2http.patch Patch1:%{name}-defaults.patch Patch2:inherit-global-%{name}.ini.patch @@ -48,6 +49,7 @@ Requires: webserver(rewrite) #Suggests: lighttpd-mod_fastcgi #Suggests: python-textile = 2.0 Obsoletes: trac-plugin-webadmin +Conflicts: apache-base 2.4.0-1 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -109,7 +111,7 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_sbindir},/var/lib/%{name},%{_datadi --root=$RPM_BUILD_ROOT cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf -cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf +cp -a %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf # utility script to enable extra plugins @@ -161,10 +163,10 @@ rm -rf $RPM_BUILD_ROOT %triggerun -- apache1 1.3.37-3, apache1-base %webapp_unregister apache %{_webapp} -%triggerin -- apache 2.2.0, apache-base +%triggerin -- apache-base %webapp_register httpd %{_webapp} -%triggerun -- apache 2.2.0, apache-base +%triggerun -- apache-base %webapp_unregister httpd %{_webapp} %triggerin -- lighttpd diff --git a/trac-httpd.conf b/trac-httpd.conf new file mode 100644 index 000..cff1eae --- /dev/null +++ b/trac-httpd.conf @@ -0,0 +1,45 @@ +# $Id$ +Alias /trac/chrome/common /usr/share/trac/htdocs +AliasMatch ^/trac/([^/]+)/chrome/common/js/jquery.js /usr/share/jquery/jquery.js +AliasMatch ^/trac/([^/]+)/chrome/common/(.*) /usr/share/trac/htdocs/$2 +# namespace for plugins +AliasMatch ^/trac/([^/]+/)?chrome/([^/]+)/(.*) /usr/share/trac/htdocs/$2/$3 + +Directory /usr/share/trac/htdocs + Require all granted +/Directory + +# TracModPython +# http://projects.edgewall.com/trac/wiki/TracModPython +IfModule mod_python.c + Location /trac + SetHandler mod_python + PythonHandler trac.web.modpython_frontend + # For multiple projects + PythonOption TracEnvParentDir /var/lib/trac + /Location + Location ~ ^/trac/([^/]+/)?chrome/ + Sethandler default-handler + /Location +/IfModule + +# TracCgi +# http://projects.edgewall.com/trac/wiki/TracCgi +IfModule !mod_python.c + ScriptAlias /trac /usr/share/trac/cgi-bin/trac.cgi + Location /trac + IfModule mod_env.c + SetEnv TRAC_ENV_PARENT_DIR /var/lib/trac + /IfModule + Require all granted + /Location +/IfModule + +# You need this to allow users to authenticate +Location ~ ^/trac/[^/]+/login + AuthType Basic + AuthName trac + AuthUserFile /etc/webapps/trac/htpasswd + Require valid-user + Require all granted +/Location gitweb: http://git.pld-linux.org/gitweb.cgi/packages/trac.git/commitdiff/cd0e5f302ac524c57c242df8f86b04b7d157851f ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/viewvc] - migrated to apache 2.4
commit 1805023c170378b1707e1246e812b6f0a530e1cf Author: Jan Rękorajski bagg...@pld-linux.org Date: Fri May 17 11:44:53 2013 +0200 - migrated to apache 2.4 viewvc-apache.conf | 34 ++ viewvc-httpd.conf | 6 +++--- viewvc.spec| 12 +++- 3 files changed, 44 insertions(+), 8 deletions(-) --- diff --git a/viewvc.spec b/viewvc.spec index 2f52105..8611c11 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -5,12 +5,13 @@ Summary: Browser interface for CVS and Subversion version control repositories Summary(pl.UTF-8): Interfejs przeglądarki do repozytoriów systemów kontroli wersji CVS i Subversion Name: viewvc Version: 1.1.9 -Release: 1 +Release: 2 License: BSD Group: Applications/WWW Source0: http://www.viewvc.org/%{name}-%{version}.tar.gz # Source0-md5: 13292307114b0f4bb4fc322597ec8007 -Source1: %{name}-httpd.conf +Source1: %{name}-apache.conf +Source2: %{name}-httpd.conf URL: http://www.viewvc.org/ BuildRequires: python BuildRequires: python-modules @@ -19,6 +20,7 @@ BuildRequires:rpmbuild(macros) = 1.268 Requires: %{name}-template Requires: webapps Obsoletes: viewcvs +Conflicts: apache-base 2.4.0-1 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -167,7 +169,7 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_webapps}/%{_webapp},%{_appdir},%{_sysconfdir}} cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf -cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf +cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf #install lighttpd.conf $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/lighttpd.conf ./viewvc-install --destdir=$RPM_BUILD_ROOT --prefix=%{_appdir} @@ -195,10 +197,10 @@ rm -rf $RPM_BUILD_ROOT %triggerun -- apache1 1.3.37-3, apache1-base %webapp_unregister apache %{_webapp} -%triggerin -- apache 2.2.0, apache-base +%triggerin -- apache-base %webapp_register httpd %{_webapp} -%triggerun -- apache 2.2.0, apache-base +%triggerun -- apache-base %webapp_unregister httpd %{_webapp} %if 0 diff --git a/viewvc-apache.conf b/viewvc-apache.conf new file mode 100644 index 000..7e3de1a --- /dev/null +++ b/viewvc-apache.conf @@ -0,0 +1,34 @@ +Directory /usr/share/viewvc +AllowOverride None +Options +FollowSymlinks +Allow from all +/Directory + +# Version1 (default): under /cgi-bin/viewvc.cgi address +ScriptAlias /cgi-bin/viewvc.cgi /usr/share/viewvc/bin/cgi/viewvc.cgi +ScriptAlias /cgi-bin/viewvc-query.cgi /usr/share/viewvc/bin/cgi/query.cgi + +# if using apache2 mod_python: +# Alias /viewvc/usr/share/viewvc/bin/mod_python +# Location /viewvc +#Allow from all +# IfModule mod_python.c +# AddHandler mod_python .py +# PythonPath sys.path+['/usr/share/viewvc/bin/mod_python'] +# PythonHandler handler +# PythonDebug Off +# /IfModule +# /Location + +# Version 2: viewvc as handler to whole vhost: +#VirtualHost *:80 +# ServerName cvs +# +# Alias /viewvc/ /usr/share/viewvc +# DocumentRoot /usr/share/viewvc/bin/cgi/viewvc.cgi +# Location / +# Options ExecCGI +# Allow from all +# /Location +#/VirtualHost + diff --git a/viewvc-httpd.conf b/viewvc-httpd.conf index 7e3de1a..c05fbbb 100644 --- a/viewvc-httpd.conf +++ b/viewvc-httpd.conf @@ -1,7 +1,7 @@ Directory /usr/share/viewvc AllowOverride None Options +FollowSymlinks -Allow from all +Require all granted /Directory # Version1 (default): under /cgi-bin/viewvc.cgi address @@ -11,7 +11,7 @@ ScriptAlias /cgi-bin/viewvc-query.cgi /usr/share/viewvc/bin/cgi/query.cgi # if using apache2 mod_python: # Alias /viewvc/usr/share/viewvc/bin/mod_python # Location /viewvc -#Allow from all +#Require all granted # IfModule mod_python.c # AddHandler mod_python .py # PythonPath sys.path+['/usr/share/viewvc/bin/mod_python'] @@ -28,7 +28,7 @@ ScriptAlias /cgi-bin/viewvc-query.cgi /usr/share/viewvc/bin/cgi/query.cgi # DocumentRoot /usr/share/viewvc/bin/cgi/viewvc.cgi # Location / # Options ExecCGI -# Allow from all +# Require all granted # /Location #/VirtualHost gitweb: http://git.pld-linux.org/gitweb.cgi/packages/viewvc.git/commitdiff/1805023c170378b1707e1246e812b6f0a530e1cf ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/wordpress] - migrated to apache 2.4
commit ec3e15032f6d22666c437d2bc1c25a847c73116d Author: Jan Rękorajski bagg...@pld-linux.org Date: Fri May 17 11:46:11 2013 +0200 - migrated to apache 2.4 httpd.conf | 16 wordpress.spec | 8 +--- 2 files changed, 21 insertions(+), 3 deletions(-) --- diff --git a/wordpress.spec b/wordpress.spec index d76e93e..3319061 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -21,6 +21,7 @@ Source6: http://svn.automattic.com/wordpress-i18n/et/tags/%{version}/messages/et # Source6-md5: faccf42481d5bf742b019c24a3c6251a Source7: http://svn.automattic.com/wordpress-i18n/pl_PL/tags/%{version}/messages/pl_PL.po # Source7-md5: 8c9038410b596f9c705cc006dcdd5960 +Source8: httpd.conf Patch0:configpath.patch Patch1:multisite.patch Patch2:%{name}.patch @@ -53,6 +54,7 @@ Requires: php-phpmailer = 2.0.4 Requires: php-simplepie = 1.2 Requires: webapps Requires: webserver(php) +Conflicts: apache-base 2.4.0-1 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -200,8 +202,8 @@ install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/wp-setup ln -s %{_bindir}/wp-setup $RPM_BUILD_ROOT%{_appdir}/wp-setup.sh ln -s %{_bindir}/wp-secure $RPM_BUILD_ROOT%{_appdir}/wp-secure.sh -cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf +cp -a %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf %clean @@ -238,10 +240,10 @@ fi %triggerun -- apache1 1.3.37-3, apache1-base %webapp_unregister apache %{_webapp} -%triggerin -- apache 2.2.0, apache-base +%triggerin -- apache-base %webapp_register httpd %{_webapp} -%triggerun -- apache 2.2.0, apache-base +%triggerun -- apache-base %webapp_unregister httpd %{_webapp} %triggerun -- lighttpd diff --git a/httpd.conf b/httpd.conf new file mode 100644 index 000..80d7567 --- /dev/null +++ b/httpd.conf @@ -0,0 +1,16 @@ +Alias /wordpress /usr/share/wordpress + +Directory /usr/share/wordpress + Require all granted + php_admin_flag engine on + php_admin_value open_basedir /usr/share/wordpress:/etc/webapps/wordpress + + IfModule mod_rewrite.c + Options +FollowSymLinks + RewriteEngine On + RewriteBase /wordpress/ + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_FILENAME} !-d + RewriteRule . /wordpress/index.php [L] + /IfModule +/Directory gitweb: http://git.pld-linux.org/gitweb.cgi/packages/wordpress.git/commitdiff/ec3e15032f6d22666c437d2bc1c25a847c73116d ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/wordpress] - rel 4
commit bef97417c113487cd3e690687995c3ef65d343f9 Author: Jan Rękorajski bagg...@pld-linux.org Date: Fri May 17 11:47:26 2013 +0200 - rel 4 wordpress.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/wordpress.spec b/wordpress.spec index 3319061..39030e4 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -7,7 +7,7 @@ Summary:Personal publishing system Summary(pl.UTF-8): Osobisty system publikacji Name: wordpress Version: 3.0.4 -Release: 3 +Release: 4 License: GPL v2 Group: Applications/Publishing Source0: http://wordpress.org/%{name}-%{version}.tar.gz gitweb: http://git.pld-linux.org/gitweb.cgi/packages/wordpress.git/commitdiff/bef97417c113487cd3e690687995c3ef65d343f9 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/squirrelmail] - fix files listed twice - rel 5
commit 073fba8a532df7531835fef99c186b9c541303bd Author: Jan Rękorajski bagg...@pld-linux.org Date: Fri May 17 11:52:15 2013 +0200 - fix files listed twice - rel 5 squirrelmail.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- diff --git a/squirrelmail.spec b/squirrelmail.spec index 78d721b..694a8e6 100644 --- a/squirrelmail.spec +++ b/squirrelmail.spec @@ -3,7 +3,7 @@ Summary(pl.UTF-8): Wiewiórcza Poczta, Poczta przez WWW Summary(pt_BR.UTF-8): O SquirrelMail é um webmail Name: squirrelmail Version: 1.4.21 -Release: 4 +Release: 5 License: GPL v2+ Group: Applications/Mail Source0: http://dl.sourceforge.net/squirrelmail/%{name}-%{version}.tar.bz2 @@ -286,7 +286,6 @@ fi %lang(cy) %{_squirreldir}/help/cy_GB %lang(da) %{_squirreldir}/help/da_DK %lang(de) %{_squirreldir}/help/de_DE -%lang(en) %{_squirreldir}/help/en_US %lang(es) %{_squirreldir}/help/es_ES %lang(fa) %{_squirreldir}/help/fa_IR %lang(fi) %{_squirreldir}/help/fi_FI gitweb: http://git.pld-linux.org/gitweb.cgi/packages/squirrelmail.git/commitdiff/073fba8a532df7531835fef99c186b9c541303bd ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/bacula-web] - updated files - rel 3
commit 71a111a6cb6b4e7ebbb2523179bdf01411070254 Author: Jan Rękorajski bagg...@pld-linux.org Date: Fri May 17 11:54:52 2013 +0200 - updated files - rel 3 bacula-web.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- diff --git a/bacula-web.spec b/bacula-web.spec index 86363f8..59a77c4 100644 --- a/bacula-web.spec +++ b/bacula-web.spec @@ -5,7 +5,7 @@ Summary: Open source monitoring and reporting tool for Bacula Name: bacula-web Version: 5.2.12 -Release: 2 +Release: 3 License: GPL v2 Group: Applications/WWW Source0: http://www.bacula-web.org/tl_files/downloads/%{name}-%{version}.tar.gz @@ -120,7 +120,6 @@ fi %{_appdir}/core/bweb.inc.php %{_appdir}/core/global.inc.php %{_appdir}/core/app -%{_appdir}/core/cfg %{_appdir}/core/db %{_appdir}/core/graph %{_appdir}/core/i18n gitweb: http://git.pld-linux.org/gitweb.cgi/packages/bacula-web.git/commitdiff/71a111a6cb6b4e7ebbb2523179bdf01411070254 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/kernel] - m for speaker
commit fe5beae90d59bb3f5c3eb2cece5fefb08244ccf6 Author: Arkadiusz Miśkiewicz ar...@maven.pl Date: Fri May 17 12:02:04 2013 +0200 - m for speaker kernel-multiarch.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/kernel-multiarch.config b/kernel-multiarch.config index 758ee4a..cd81812 100644 --- a/kernel-multiarch.config +++ b/kernel-multiarch.config @@ -8776,7 +8776,7 @@ SND_OPL4_LIB alpha=m i386=m SND_VX_LIB all=m SND_AC97_CODEC all=m SND_DRIVERS all=n -SND_PCSP all=y +SND_PCSP all=m SND_DUMMY all=m SND_VIRMIDI all=m SND_MTPAV all=m gitweb: http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/fe5beae90d59bb3f5c3eb2cece5fefb08244ccf6 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/eventum] - updated BRs - rel 4
commit 6995a4ebbe650c0e89086e2a8f1f5077d7ea69cf Author: Jan Rękorajski bagg...@pld-linux.org Date: Fri May 17 12:02:54 2013 +0200 - updated BRs - rel 4 eventum.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- diff --git a/eventum.spec b/eventum.spec index b566497..05d8f74 100644 --- a/eventum.spec +++ b/eventum.spec @@ -11,7 +11,7 @@ %definephp_min_version 5.1.2 #definesubver RC3 -%definerel 3 +%definerel 4 %include /usr/lib/rpm/macros.php Summary: Eventum Issue / Bug tracking system Summary(pl.UTF-8): Eventum - system śledzenia spraw/błędów @@ -54,6 +54,7 @@ Patch107: %{name}-gettext.patch Patch200: %{name}-fixed-nav.patch URL: http://eventum.mysql.org/ BuildRequires: gettext-devel +BuildRequires: php-program BuildRequires: rpm-php-pearprov = 4.0.2-98 BuildRequires: rpmbuild(macros) = 1.654 BuildRequires: sed = 4.0 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/eventum.git/commitdiff/6995a4ebbe650c0e89086e2a8f1f5077d7ea69cf ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/gallery] - don't package config.php twice - rel 3
commit a09a3dd3e09ef0ddbe72898cfd66e71f6a06d236 Author: Jan Rękorajski bagg...@pld-linux.org Date: Fri May 17 12:04:40 2013 +0200 - don't package config.php twice - rel 3 gallery.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- diff --git a/gallery.spec b/gallery.spec index 5857789..f7355d6 100644 --- a/gallery.spec +++ b/gallery.spec @@ -5,7 +5,7 @@ Summary:Web based photo album viewer and creator Summary(pl.UTF-8): Przeglądarka i generator albumów zdjęć w postaci stron WWW Name: gallery Version: 2.3 -Release: 2 +Release: 3 License: GPL Group: Applications/Publishing Source0: http://dl.sourceforge.net/gallery/%{name}-%{version}-full.tar.gz @@ -141,6 +141,5 @@ rm -rf $RPM_BUILD_ROOT %files setup %defattr(644,root,root,755) %{_appdir}/README.html -%{_appdir}/config.php %{_appdir}/install %{_appdir}/upgrade gitweb: http://git.pld-linux.org/gitweb.cgi/packages/gallery.git/commitdiff/a09a3dd3e09ef0ddbe72898cfd66e71f6a06d236 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/lms] - added missing include file - rel 7
commit c66e68d71685055babdfeffaa357063a7215882b Author: Jan Rękorajski bagg...@pld-linux.org Date: Fri May 17 12:11:16 2013 +0200 - added missing include file - rel 7 build.patch | 10 ++ lms.spec| 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) --- diff --git a/lms.spec b/lms.spec index e448e8a..073e42f 100644 --- a/lms.spec +++ b/lms.spec @@ -13,7 +13,7 @@ Summary: LAN Managment System Summary(pl.UTF-8): System Zarządzania Siecią Lokalną Name: lms Version: %{lmsver}.%{lmssubver} -Release: 6 +Release: 7 License: GPL v2 Group: Networking/Utilities Source0: http://www.lms.org.pl/download/%{lmsver}/%{name}-%{version}.tar.gz @@ -25,6 +25,7 @@ Source4: %{name}-httpd.conf Patch0:%{name}-PLD.patch Patch1:%{name}-amd64.patch Patch2:%{name}-smarty.patch +Patch3:build.patch URL: http://www.lms.org.pl/ BuildRequires: bison BuildRequires: flex @@ -187,6 +188,7 @@ formularza przelewu. %patch1 -p1 %endif %patch2 -p1 +%patch3 -p1 mkdir smarty-plugins %{__mv} \ diff --git a/build.patch b/build.patch new file mode 100644 index 000..0e1b41f --- /dev/null +++ b/build.patch @@ -0,0 +1,10 @@ +--- lms/daemon/modules/parser/lib/tscript_parser.y~2006-07-31 10:32:22.0 +0200 lms/daemon/modules/parser/lib/tscript_parser.y 2013-05-17 12:09:12.547241774 +0200 +@@ -30,6 +30,7 @@ + */ + + %{ ++ #include stdio.h + #include stdlib.h + #include tscript_ast.h + gitweb: http://git.pld-linux.org/gitweb.cgi/packages/lms.git/commitdiff/c66e68d71685055babdfeffaa357063a7215882b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/sipp] Version: 3.3
commit aaa207f12f5d5127a9201d0c8905c73806863c42 Author: Jacek Konieczny j.koniec...@eggsoft.pl Date: Fri May 17 12:15:58 2013 +0200 Version: 3.3 sipp-sprintf.patch | 12 sipp.spec | 12 +++- 2 files changed, 19 insertions(+), 5 deletions(-) --- diff --git a/sipp.spec b/sipp.spec index 9d32968..e580d06 100644 --- a/sipp.spec +++ b/sipp.spec @@ -1,13 +1,14 @@ # Summary: SIPp - a performance testing tool for the SIP protocol Name: sipp -Version: 3.0 -Release: 5 +Version: 3.3 +Release: 1 License: GPL v2+ except two files under BSD Group: Applications -Source0: http://dl.sourceforge.net/sipp/%{name}-%{version}.src.tar.gz -# Source0-md5: 31906c63eb5efa09e0b148c27435cdac +Source0: http://dl.sourceforge.net/sipp/%{name}-%{version}.tar.xz +# Source0-md5: f0c4f472fa86de8a528cb91616323617 Patch0:%{name}-headers.patch +Patch1:%{name}-sprintf.patch URL: http://sipp.sourceforge.net/ BuildRequires: libpcap-devel BuildRequires: libstdc++-devel @@ -32,8 +33,9 @@ very useful to emulate thousands of user agents calling your SIP system. %prep -%setup -q -n %{name}-%{version}.src +%setup -q %patch0 -p1 +%patch1 -p1 %build diff --git a/sipp-sprintf.patch b/sipp-sprintf.patch new file mode 100644 index 000..176065a --- /dev/null +++ b/sipp-sprintf.patch @@ -0,0 +1,12 @@ +diff -dur sipp-3.3.orig/stat.cpp sipp-3.3/stat.cpp +--- sipp-3.3.orig/stat.cpp 2012-12-22 02:50:15.0 +0100 sipp-3.3/stat.cpp 2013-05-17 12:11:26.0 +0200 +@@ -1148,7 +1148,7 @@ + { + // if a repartition is present, this field match the repartition name + repartitionInfo = (char *)realloc(repartitionInfo, dlen + 1); +- sprintf(repartitionInfo, stat_delimiter); ++ strcpy(stat_delimiter, repartitionInfo); + for(int i=0; i(sizeOfTab-1); i++) + { + sprintf(buffer, %lu%s, tabRepartition[i].nbInThisBorder, stat_delimiter); gitweb: http://git.pld-linux.org/gitweb.cgi/packages/sipp.git/commitdiff/aaa207f12f5d5127a9201d0c8905c73806863c42 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: sipp: ERRORS: sipp-3.3.tar.xz
wget -nv --no-check-certificate --user-agent=PLD/distfiles -O ./tmp/0cd33092-73bb-4ebb-bacd-195ef8f4f928/f0c4f472fa86de8a528cb91616323617/sipp-3.3.tar.xz http://dl.sourceforge.net/sipp/sipp-3.3.tar.xz: exited with code 4 (0x00) FATAL: http://dl.sourceforge.net/sipp/sipp-3.3.tar.xz (f0c4f472fa86de8a528cb91616323617) was not fetched correctly (wget -nv --no-check-certificate --user-agent=PLD/distfiles -O ./tmp/0cd33092-73bb-4ebb-bacd-195ef8f4f928/f0c4f472fa86de8a528cb91616323617/sipp-3.3.tar.xz http://dl.sourceforge.net/sipp/sipp-3.3.tar.xz: ): 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
[PLDWWW] page changed: people:glen
[PLD Linux VirtualBox images] --- https://www.pld-linux.org/people/glen?rev=1360164684 +++ https://www.pld-linux.org/people/glen @@ -237,12 +237,12 @@ now remove the old disk and voila! = PLD Linux VirtualBox images = - I've created PLD VirtualBox images, exported into [[wpOpen Virtualization Format|OVA (Open Virtualization Archive)]] format + I've created PLD VirtualBox images, exported into [[wpOpen Virtualization Format|OVA (Open Virtualization Archive)]] format. + There's also [[wpVagrant (software)|Vagrant]] base images (''.box''). * ftp://ftp.pld-linux.org/people/glen/vm/ - = Upgrading PHP 5.3 - PHP 5.4 = filepoldek --sn carme --up -u $(rpm -qa --qf '%{N} %{V}-%{R}\n' | awk -vv=$(rpm -q php-common --qf '%{V}-%{R}') '$2 == v {sub(/php/, php54, $1); print $1}') Diff URL: https://www.pld-linux.org/people/glen?do=diffr1=1360164684r2=1368787175 -- This mail was generated by DokuWiki at https://www.pld-linux.org/ ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/eventum] - fix php BR
commit 447ff24646b3a77cfcf0537e901bbd1fbf20cfbb Author: Jan Rękorajski bagg...@pld-linux.org Date: Fri May 17 12:48:21 2013 +0200 - fix php BR eventum.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/eventum.spec b/eventum.spec index 05d8f74..e68944f 100644 --- a/eventum.spec +++ b/eventum.spec @@ -53,8 +53,8 @@ Patch107: %{name}-gettext.patch # some tests Patch200: %{name}-fixed-nav.patch URL: http://eventum.mysql.org/ +BuildRequires: /usr/bin/php BuildRequires: gettext-devel -BuildRequires: php-program BuildRequires: rpm-php-pearprov = 4.0.2-98 BuildRequires: rpmbuild(macros) = 1.654 BuildRequires: sed = 4.0 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/eventum.git/commitdiff/447ff24646b3a77cfcf0537e901bbd1fbf20cfbb ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: sipp: ERRORS: sipp-3.3.tar.xz
wget -nv --no-check-certificate --user-agent=PLD/distfiles -O ./tmp/4c458d7d-3f97-40c8-8be5-b42c63a41084/f0c4f472fa86de8a528cb91616323617/sipp-3.3.tar.xz http://dl.sourceforge.net/sipp/sipp-3.3.tar.xz: exited with code 4 (0x00) FATAL: http://dl.sourceforge.net/sipp/sipp-3.3.tar.xz (f0c4f472fa86de8a528cb91616323617) was not fetched correctly (wget -nv --no-check-certificate --user-agent=PLD/distfiles -O ./tmp/4c458d7d-3f97-40c8-8be5-b42c63a41084/f0c4f472fa86de8a528cb91616323617/sipp-3.3.tar.xz http://dl.sourceforge.net/sipp/sipp-3.3.tar.xz: ): 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: cgit: cgit-0.9.1.tar.bz2
Files fetched: 1 STORED: http://hjemli.net/git/cgit/snapshot/cgit-0.9.1.tar.bz2 78403e6a15a61bb06cb2b8447079139a cgit-0.9.1.tar.bz2 Size: 67736 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-django] Version: 1.5.1
commit d2a760e33b45ff2dc9c6968abf3c66672bf0dd22 Author: Jacek Konieczny j.koniec...@eggsoft.pl Date: Fri May 17 13:41:39 2013 +0200 Version: 1.5.1 Now with Python3 support (still experimental, though) python-django.spec | 76 +- 1 file changed, 69 insertions(+), 7 deletions(-) --- diff --git a/python-django.spec b/python-django.spec index b034568..f5e4f59 100644 --- a/python-django.spec +++ b/python-django.spec @@ -1,17 +1,27 @@ +# Conditional build: +%bcond_without python2 # CPython 2.x module +%bcond_without python3 # CPython 3.x module + %definemodule django Summary: The web framework for perfectionists with deadlines Summary(pl.UTF-8): Szkielet WWW dla perfekcjonistów z ograniczeniami czasowymi Name: python-%{module} -Version: 1.4.3 +Version: 1.5.1 Release: 1 License: BSD Group: Libraries/Python -Source0: http://www.djangoproject.com/m/releases/1.4/Django-%{version}.tar.gz -# Source0-md5: 0b134c44b6dc8eb36822677ef506c9ab +Source0: http://www.djangoproject.com/m/releases/1.5/Django-%{version}.tar.gz +# Source0-md5: 7465f6383264ba167a9a031d6b058bff Patch0:%{name}-pyc.patch URL: http://www.djangoproject.com/ -BuildRequires: python-devel = 2.5 +%if %{with python2} +BuildRequires: python-devel = 2.6 BuildRequires: python-setuptools +%endif +%if %{with python3} +BuildRequires: python3-devel = 3.3 +BuildRequires: python3-distribute +%endif BuildRequires: rpm-pythonprov BuildRequires: sphinx-pdg %pyrequires_eq python @@ -28,6 +38,22 @@ development and clean, pragmatic design. Django to wysokopoziomowy szkielet dla serwisów WWW w Pythonie wspierający szybkie tworzenie i czysty, pragmatyczny projekt. +%package -n python3-%{module} +Summary: The web framework for perfectionists with deadlines +Summary(pl.UTF-8): Szkielet WWW dla perfekcjonistów z ograniczeniami czasowymi +Group: Libraries/Python +%pyrequires_eq python3 +#Suggests: python3-MySQLdb # not available yet +Suggests: python3-psycopg2 + +%description -n python3-%{module} +Django is a high-level Python Web framework that encourages rapid +development and clean, pragmatic design. + +%description -n python3-%{module} -l pl.UTF-8 +Django to wysokopoziomowy szkielet dla serwisów WWW w Pythonie +wspierający szybkie tworzenie i czysty, pragmatyczny projekt. + %package doc Summary: Documentation on Django Summary(de.UTF-8): Dokumentation zu Django @@ -53,18 +79,41 @@ Dokumentacja do Django. %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_docdir} + +%if %{with python2} %{__python} setup.py install \ --optimize 2 \ --root=$RPM_BUILD_ROOT +cp $RPM_BUILD_ROOT%{_bindir}/{django-admin.py,py2-django-admin} +%endif + +%if %{with python3} +%{__python3} setup.py install \ + --optimize 2 \ + --root=$RPM_BUILD_ROOT +cp $RPM_BUILD_ROOT%{_bindir}/{django-admin.py,py3-django-admin} +%if %{with python2} +# default to python2 if built +cp $RPM_BUILD_ROOT%{_bindir}/{py2-django-admin,django-admin.py} +%endif +%endif find $RPM_BUILD_ROOT -type f -name '*.py[co]' | xargs rm find $RPM_BUILD_ROOT -type f -exec sed -i -e s#$RPM_BUILD_ROOT##g {} ; +%if %{with python2} %py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir} %py_comp $RPM_BUILD_ROOT%{py_sitescriptdir} -# %%py_postclean + +# %%py_postclean (only for python2!) find $RPM_BUILD_ROOT%{py_sitescriptdir} -type f -name '*.py' -a -not -path '*_template*' | xargs rm find $RPM_BUILD_ROOT%{py_sitescriptdir} -type f -path '*_template*' -a -name '*.py[oc]' | xargs rm +%endif + +%if %{with python3} +%py3_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir} +%py3_comp $RPM_BUILD_ROOT%{py_sitescriptdir} +%endif ln -sf python-django-doc-%{version} $RPM_BUILD_ROOT%{_docdir}/python-django-doc rm -rf docs/_build/html/_sources @@ -72,15 +121,28 @@ rm -rf docs/_build/html/_sources %clean rm -rf $RPM_BUILD_ROOT +%if %{with python2} %files %defattr(644,root,root,755) -%doc README +%doc README.rst %attr(755,root,root) %{_bindir}/django-admin.py +%attr(755,root,root) %{_bindir}/py2-django-admin %{py_sitescriptdir}/%{module}* -%if %{py_ver} 2.4 %{py_sitescriptdir}/Django-*.egg-info %endif +%if %{with python3} +%files -n python3-%{module} +%defattr(644,root,root,755) +%doc README.rst +%if %{without python2} +%attr(755,root,root) %{_bindir}/django-admin.py +%endif +%attr(755,root,root) %{_bindir}/py3-django-admin +%{py3_sitescriptdir}/%{module}* +%{py3_sitescriptdir}/Django-*.egg-info +%endif + %files doc %defattr(644,root,root,755) %doc docs/_build/html gitweb: http://git.pld-linux.org/gitweb.cgi/packages/python-django.git/commitdiff/d2a760e33b45ff2dc9c6968abf3c66672bf0dd22 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org
DISTFILES: python-django: Django-1.5.1.tar.gz
Files fetched: 1 STORED: http://www.djangoproject.com/m/releases/1.5/Django-1.5.1.tar.gz 7465f6383264ba167a9a031d6b058bff Django-1.5.1.tar.gz Size: 8028963 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: sipp: ERRORS: sipp-3.3.tar.xz
wget -nv --no-check-certificate --user-agent=PLD/distfiles -O ./tmp/0e94b177-1f27-467f-8f0f-2be7302ad62f/f0c4f472fa86de8a528cb91616323617/sipp-3.3.tar.xz http://dl.sourceforge.net/sipp/sipp-3.3.tar.xz: exited with code 4 (0x00) FATAL: http://dl.sourceforge.net/sipp/sipp-3.3.tar.xz (f0c4f472fa86de8a528cb91616323617) was not fetched correctly (wget -nv --no-check-certificate --user-agent=PLD/distfiles -O ./tmp/0e94b177-1f27-467f-8f0f-2be7302ad62f/f0c4f472fa86de8a528cb91616323617/sipp-3.3.tar.xz http://dl.sourceforge.net/sipp/sipp-3.3.tar.xz: ): 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/moodle] - updated to 2.5
commit 47e4b6f435f2a4dda0dfd2ad4862d67a73b69585 Author: Jan Rękorajski bagg...@pld-linux.org Date: Fri May 17 13:48:58 2013 +0200 - updated to 2.5 moodle-config.patch | 9 - moodle.spec | 15 +-- 2 files changed, 5 insertions(+), 19 deletions(-) --- diff --git a/moodle.spec b/moodle.spec index fc80a63..83db0cb 100644 --- a/moodle.spec +++ b/moodle.spec @@ -6,14 +6,14 @@ Summary: Learning management system Summary(pl.UTF-8): System zarządzania nauczaniem Name: moodle -Version: 2.0.2 +Version: 2.5 Release: 1 License: GPL v2 Group: Applications/Databases/Interfaces -Source0: http://download.moodle.org/stable20/%{name}-%{version}.tgz -# Source0-md5: c9ff3ca4aa6f8470993e331c3e59ed33 +Source0: http://download.moodle.org/download.php/direct/stable25/%{name}-%{version}.tgz +# Source0-md5: 7d6af93119fc7a2aca605abf832f145a Source1: http://www.forkosh.com/mimetex.zip -# Source1-md5: 56e66e59c0c78ca824ac0a2c54565539 +# Source1-md5: a5c256c62b33492553b1bc97f52fe596 Source2: %{name}-apache.conf Source3: %{name}-httpd.conf Patch0:%{name}-config.patch @@ -76,16 +76,13 @@ mkdir mimetex unzip %{SOURCE1} -d mimetex/ # Move docs into proper place: -mv -f admin/xmldb/README.txt README_admin_xmldb.txt mv -f auth/cas/README-CAS README_auth_CAS.txt mv -f auth/fc/Readme.txt README_auth_fc.txt mv -f auth/ldap/README-LDAP README_auth_LDAP.txt mv -f auth/README.txt README_auth.txt mv -f auth/shibboleth/README.txt README_auth_shibboleth.txt -mv -f backup/bb/README.txt README_bb.txt mv -f course/format/README.txt README_course_format.txt mv -f filter/censor/README.txt README_filter_censor.txt -mv -f filter/mediaplugin/flvplayer.README.txt README_fliter_flvplayer.txt mv -f filter/multilang/README.txt README_filter_multilang.txt mv -f filter/tex/README.mimetex README_filter_tex_mimetex.txt mv -f filter/tex/readme_moodle.txt README_filter_tex.txt @@ -97,11 +94,9 @@ mv -f mod/chat/README.txt README_mod_chat.txt mv -f mod/glossary/README.txt README_mod_glossary.txt mv -f mod/glossary/TODO.txt TODO_mod_glossary.txt mv -f mod/README.txt README_mod.txt -mv -f mod/scorm/README.txt README_mod_scorm.txt mv -f question/format/README.txt README_question_format.txt mv -f question/format/webct/TODO.txt TODO_question_format_webct.txt mv -f repository/README.txt README_repository.txt -mv -f search/README.txt README_search.txt %build cd mimetex @@ -137,7 +132,7 @@ install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf # Final cleanup: -%{__rm} $RPM_BUILD_ROOT%{_moodledir}/{*.txt,tags} +%{__rm} $RPM_BUILD_ROOT%{_moodledir}/*.txt find $RPM_BUILD_ROOT%{_moodledir} -type d -printf dir \%{_moodledir}/%%P\\n files.list find $RPM_BUILD_ROOT%{_moodledir} \( ! -type d -a ! -name 'mimetex.linux' \) -printf \%{_moodledir}/%%P\\n files.list diff --git a/moodle-config.patch b/moodle-config.patch index 64683a9..7d1d43f 100644 --- a/moodle-config.patch +++ b/moodle-config.patch @@ -1,14 +1,5 @@ --- ./config-dist.php.org Mon May 24 09:43:09 2004 +++ ./config-dist.php Sat Aug 14 23:00:31 2004 -@@ -80,7 +80,7 @@ - //$CFG-dirroot = '/var/www/html/moodle'; // Redhat Linux - //$CFG-dirroot = '/home/example/public_html/moodle'; // Cpanel host - --$CFG-dirroot = '/home/example/public_html/moodle'; -+$CFG-dirroot = '/usr/share/moodle'; - - - //= @@ -96,7 +96,7 @@ // // - On Windows systems you might specify something like 'c:\moodledata' gitweb: http://git.pld-linux.org/gitweb.cgi/packages/moodle.git/commitdiff/47e4b6f435f2a4dda0dfd2ad4862d67a73b69585 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: moodle: moodle-2.5.tgz mimetex.zip
Files fetched: 2 STORED: http://download.moodle.org/download.php/direct/stable25/moodle-2.5.tgz 7d6af93119fc7a2aca605abf832f145a moodle-2.5.tgz Size: 31758353 bytes STORED: http://www.forkosh.com/mimetex.zip a5c256c62b33492553b1bc97f52fe596 mimetex.zip Size: 1191191 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/mythtv] - updatd files - build with system zeromq - rel 1
commit 8cb121d03e613b04b1d44c0aa6a6575dee0ae69d Author: Jan Rękorajski bagg...@pld-linux.org Date: Fri May 17 14:51:30 2013 +0200 - updatd files - build with system zeromq - rel 1 mythtv.spec | 32 +++- system-zeromq.patch | 52 2 files changed, 83 insertions(+), 1 deletion(-) --- diff --git a/mythtv.spec b/mythtv.spec index 8c6534a..4859d11 100644 --- a/mythtv.spec +++ b/mythtv.spec @@ -35,6 +35,7 @@ %bcond_withvaapi # enable vaapi %bcond_with dshowserver# enable directshow codecs server %bcond_withperl +%bcond_withphp %bcond_withpython %bcond_withnvidia_headers # build vdpau support with nvidia headers # instead of libvdpau @@ -56,7 +57,7 @@ Summary: A personal video recorder (PVR) application Summary(pl.UTF-8): Osobista aplikacja do nagrywania obrazu (PVR) Name: mythtv Version: 0.26.0 -Release: 0.1 +Release: 1 License: GPL v2 Group: Applications/Multimedia Source0: ftp://ftp.osuosl.org/pub/mythtv/%{name}-%{version}.tar.bz2 @@ -72,6 +73,7 @@ Source6: pld-mythfrontend.png Source20: dshowcodecs # Source20-md5:48327772b9e150f69e1ab8ff44b9a76c Patch0:%{name}-configure.patch +Patch1:system-zeromq.patch Patch20: %{name}-compile_fixes_for_qt_4_7.patch Patch30: %{name}-dshowserver-0.22.patch URL: http://www.mythtv.org/ @@ -117,6 +119,7 @@ BuildRequires: which %{?with_nvidia_headers:%{?with_vdpau:BuildRequires: xorg-driver-video-nvidia-devel}} BuildRequires: xorg-lib-libXext-devel BuildRequires: xorg-lib-libXxf86vm-devel +BuildRequires: zeromq-devel %{!?with_pulseaudio:BuildConflicts: pulseaudio-devel} %{!?with_nvidia_headers:BuildConflicts:xorg-driver-video-nvidia-devel} # for Perl bindings @@ -332,6 +335,17 @@ MythTV Python bindings. %description -n python-MythTV -l pl.UTF-8 Ten pakiet zawiera moduły Pythona do tworzenia dodatków dla mythtv. +%package -n php-MythTV +Summary: MythTV PHP bindings +Summary(pl.UTF-8): Interfejs PHP dla MythTV +Group: Libraries + +%description -n php-MythTV +MythTV PHP bindings. + +%description -n php-MythTV -l pl.UTF-8 +Ten pakiet zawiera moduły PHP do tworzenia dodatków dla mythtv. + %prep %setup -q @@ -340,6 +354,7 @@ Ten pakiet zawiera moduły Pythona do tworzenia dodatków dla mythtv. programs/mythbackend/housekeeper.cpp programs/mythwelcome/welcomedialog.cpp %patch0 -p1 +%patch1 -p1 %{?with_dshowserver:%patch20 -p1} #%patch30 -p1 @@ -551,10 +566,16 @@ fi %attr(755,root,root) %{_bindir}/mythfilldatabase %attr(755,root,root) %{_bindir}/mythjobqueue %attr(755,root,root) %{_bindir}/mythlcdserver +%attr(755,root,root) %{_bindir}/mythlogserver +%attr(755,root,root) %{_bindir}/mythmediaserver %attr(755,root,root) %{_bindir}/mythtranscode %attr(755,root,root) %{_bindir}/mythreplex %attr(755,root,root) %{_bindir}/mythffmpeg %attr(755,root,root) %{_bindir}/mythpreviewgen +%attr(755,root,root) %{_bindir}/mythccextractor +%attr(755,root,root) %{_bindir}/mythmetadatalookup +%attr(755,root,root) %{_bindir}/mythutil + %attr(775,root,mythtv) %dir /var/lib/mythtv %attr(700,root,mythtv) %dir /var/lib/mythtv/tmp %attr(775,root,mythtv) %dir /var/cache/mythtv @@ -564,6 +585,8 @@ fi %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/mythbackend %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/mythbackend %attr(775,root,mythtv) %dir %{_localstatedir}/log/mythtv +%{_datadir}/mythtv/backend-config +%{_datadir}/mythtv/html %files frontend -f mythfrontend.lang %defattr(644,root,root,755) @@ -581,6 +604,7 @@ fi %dir %{_libdir}/mythtv/plugins %attr(755,root,root) %{_libdir}/mythtv/filters/*.so %{_datadir}/mythtv/fonts/*.ttf +%{_datadir}/mythtv/fonts/*.otf %dir %{_datadir}/mythtv/i18n %if %{with dshowserver} %{_datadir}/mythtv/dshowcodecs @@ -603,6 +627,7 @@ fi %attr(755,root,root) %{_libdir}/lib*.a %dir %{_datadir}/mythtv %{_datadir}/mythtv/*.pl +%{_datadir}/mythtv/hardwareprofile %files -n libmyth-devel %defattr(644,root,root,755) @@ -632,3 +657,8 @@ fi %{py_sitescriptdir}/MythTV/* %{py_sitescriptdir}/*.egg-info %endif + +%if %{with php} +%files -n php-MythTV +%defattr(644,root,root,755) +%endif diff --git a/system-zeromq.patch b/system-zeromq.patch new file mode 100644 index 000..0adcfc2 --- /dev/null +++ b/system-zeromq.patch @@ -0,0 +1,52 @@ +--- mythtv-0.26.0/settings.pro~2012-10-02 12:30:24.0 +0200 mythtv-0.26.0/settings.pro 2013-05-17 14:39:54.880716558 +0200 +@@ -159,7 +159,7 @@ + EXTRA_LIBS += $$LOCAL_LIBDIR_OGL + EXTRA_LIBS += $$LOCAL_LIBDIR_X11 + EXTRA_LIBS += $$CONFIG_OPENGL_LIBS +-EXTRA_LIBS += -L$$SRC_PATH_BARE/external/zeromq/src/.libs -lmythzmq ++EXTRA_LIBS +=
[packages/libprelude] - fix for error: 'gets' undeclared here (not in a function) with recent libc
commit b4f4c809c6fda84e049ce5f5adbad912f286547e Author: Marcin Krol h...@tld-linux.org Date: Fri May 17 14:09:26 2013 + - fix for error: 'gets' undeclared here (not in a function) with recent libc libprelude-gets.patch | 75 +++ 1 file changed, 75 insertions(+) --- diff --git a/libprelude-gets.patch b/libprelude-gets.patch new file mode 100644 index 000..74cd58c --- /dev/null +++ b/libprelude-gets.patch @@ -0,0 +1,75 @@ +From f5fab01434b096b3bc2b058fec41123392eb3dcb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= ppi...@redhat.com +Date: Wed, 8 Aug 2012 14:13:16 +0200 +Subject: [PATCH] Fix building with glibc-2.16.6 + +Ported to libprelude-1.0.0 from gnulib commit: + +From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001 +From: Eric Blake ebl...@redhat.com +Date: Thu, 29 Mar 2012 13:30:41 -0600 +Subject: [PATCH] stdio: don't assume gets any more + +Gnulib intentionally does not have a gets module, and now that C11 +and glibc have dropped it, we should be more proactive about warning +any user on a platform that still has a declaration of this dangerous +interface. +--- + libmissing/m4/stdio_h.m4 | 4 ++-- + libmissing/m4/warn-on-use.m4 | 4 ++-- + libmissing/stdio.in.h| 6 -- + 3 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/libmissing/m4/stdio_h.m4 b/libmissing/m4/stdio_h.m4 +index 781fa8d..fc65d37 100644 +--- a/libmissing/m4/stdio_h.m4 b/libmissing/m4/stdio_h.m4 +@@ -34,9 +34,9 @@ AC_DEFUN([gl_STDIO_H], + + dnl Check for declarations of anything we want to poison if the + dnl corresponding gnulib module is not in use, and which is not +- dnl guaranteed by C89. ++ dnl guaranteed by both C89 and C11. + gl_WARN_ON_USE_PREPARE([[#include stdio.h +-]], [dprintf fpurge fseeko ftello getdelim getline popen renameat ++]], [dprintf fpurge fseeko ftello getdelim getline gets popen renameat + snprintf vdprintf vsnprintf]) + ]) + +diff --git a/libmissing/m4/warn-on-use.m4 b/libmissing/m4/warn-on-use.m4 +index ab46422..494e00b 100644 +--- a/libmissing/m4/warn-on-use.m4 b/libmissing/m4/warn-on-use.m4 +@@ -18,8 +18,8 @@ dnl with or without modifications, as long as this notice is preserved. + # some systems declare functions in the wrong header, then INCLUDES + # should do likewise. + # +-# If you assume C89, then it is generally safe to assume declarations +-# for functions declared in that standard (such as gets) without ++# It is generally safe to assume declarations for functions declared ++# in the intersection of C89 and C11 (such as printf) without + # needing gl_WARN_ON_USE_PREPARE. + AC_DEFUN([gl_WARN_ON_USE_PREPARE], + [ +diff --git a/libmissing/stdio.in.h b/libmissing/stdio.in.h +index f5d5d88..6924ef2 100644 +--- a/libmissing/stdio.in.h b/libmissing/stdio.in.h +@@ -114,10 +114,12 @@ _GL_WARN_ON_USE (fflush, fflush is not always POSIX compliant - + #endif + + /* It is very rare that the developer ever has full control of stdin, +- so any use of gets warrants an unconditional warning. Assume it is +- always declared, since it is required by C89. */ ++ so any use of gets warrants an unconditional warning; besides, C11 ++ removed it. */ + #undef gets ++#if HAVE_RAW_DECL_GETS + _GL_WARN_ON_USE (gets, gets is a security hole - use fgets instead); ++#endif + + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ +-- +1.7.11.2 + gitweb: http://git.pld-linux.org/gitweb.cgi/packages/libprelude.git/commitdiff/4ddd3a0d546390cf10e9fc98256699c94785b31d ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/libprelude] - fix for error: ptrdiff_t does not name a type with python binding
commit 5cbe98c15a9f15cd28ed7e055a8132bce9c41b67 Author: Marcin Krol h...@tld-linux.org Date: Fri May 17 14:10:56 2013 + - fix for error: ptrdiff_t does not name a type with python binding libprelude-python.patch | 13 + 1 file changed, 13 insertions(+) --- diff --git a/libprelude-python.patch b/libprelude-python.patch new file mode 100644 index 000..70a9817 --- /dev/null +++ b/libprelude-python.patch @@ -0,0 +1,13 @@ +diff -ur libprelude-1.0.1.orig/bindings/libpreludecpp.i libprelude-1.0.1.new/bindings/libpreludecpp.i +--- libprelude-1.0.1.orig/bindings/libpreludecpp.i 2012-06-01 15:12:00.0 + libprelude-1.0.1.new/bindings/libpreludecpp.i 2013-05-17 12:58:32.606635634 + +@@ -22,6 +22,9 @@ + */ + + %module PreludeEasy ++%{ ++#include stddef.h ++%} + + %include std_string.i + %include std_vector.i gitweb: http://git.pld-linux.org/gitweb.cgi/packages/libprelude.git/commitdiff/4ddd3a0d546390cf10e9fc98256699c94785b31d ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/libprelude] - updated to 1.0.1 - fix building with recent libc - fix building of python binding
commit 4ddd3a0d546390cf10e9fc98256699c94785b31d Author: Marcin Krol h...@tld-linux.org Date: Fri May 17 14:11:58 2013 + - updated to 1.0.1 - fix building with recent libc - fix building of python binding libprelude.spec | 18 +- 1 file changed, 13 insertions(+), 5 deletions(-) --- diff --git a/libprelude.spec b/libprelude.spec index fc789b0..b0943e5 100644 --- a/libprelude.spec +++ b/libprelude.spec @@ -9,15 +9,18 @@ Summary: The Prelude library Summary(pl.UTF-8): Biblioteka Prelude Name: libprelude -Version: 1.0.0 -Release: 5 +Version: 1.0.1 +Release: 1 License: GPL v2 or commercial Group: Libraries -#Source0Download: http://www.prelude-ids.com/developpement/telechargement/index.html -Source0: http://www.prelude-ids.com/download/releases/libprelude/%{name}-%{version}.tar.gz -# Source0-md5: a5bb76538d240e5fac5f6ab0b7fabfe5 +# https://www.prelude-ids.org/projects/prelude/files +Source0: https://www.prelude-ids.org/attachments/download/241/%{name}-%{version}.tar.gz +# Source0-md5: dce1ea9f82cf436830567894e7ee622f Patch0:%{name}-libtool.patch Patch1:%{name}-ruby.patch +Patch2:%{name}-gnutls.patch +Patch3:%{name}-gets.patch +Patch4:%{name}-python.patch URL: http://www.prelude-ids.com/ BuildRequires: autoconf = 2.59 BuildRequires: automake @@ -37,6 +40,7 @@ BuildRequires:rpm-pythonprov BuildRequires: rpmbuild(macros) = 1.219 %{?with_ruby:BuildRequires:ruby-devel = 1.9} BuildRequires: sed = 4.0 +BuildRequires: trousers-devel %{?with_perl:BuildRequires: swig-perl} %{?with_python:BuildRequires: swig-python} %{?with_ruby:BuildRequires: swig-ruby} @@ -227,6 +231,10 @@ PreludeEasy - dowiązania języka Ruby do libprelude. %patch1 -p1 %endif +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 + sed -i -e 's/lua = 5.1/lua51 = 5.1/' configure.in %build gitweb: http://git.pld-linux.org/gitweb.cgi/packages/libprelude.git/commitdiff/4ddd3a0d546390cf10e9fc98256699c94785b31d ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/clutter] - updated to 1.14.4
commit d8998609db246af6deb84db86cf17563fb7dd80e Author: Jakub Bogusz qbo...@pld-linux.org Date: Fri May 17 15:49:11 2013 +0200 - updated to 1.14.4 clutter.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/clutter.spec b/clutter.spec index 0946c9c..3c125a4 100644 --- a/clutter.spec +++ b/clutter.spec @@ -1,12 +1,12 @@ Summary: Library for rich GUIs Summary(pl.UTF-8): Biblioteka do bogatych graficznych interfejsów użytkownika Name: clutter -Version: 1.14.2 +Version: 1.14.4 Release: 1 License: LGPL v2+ Group: Libraries Source0: http://ftp.gnome.org/pub/GNOME/sources/clutter/1.14/%{name}-%{version}.tar.xz -# Source0-md5: efe6ede426c99389f3ff698685cf6094 +# Source0-md5: c072e4c27e69368f2b877ea4f6da2cdf Patch0:gtkdoc.patch Patch1:missing.patch URL: http://www.clutter-project.org/ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/clutter.git/commitdiff/d8998609db246af6deb84db86cf17563fb7dd80e ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: libprelude: libprelude-1.0.1.tar.gz
Files fetched: 1 STORED: https://www.prelude-ids.org/attachments/download/241/libprelude-1.0.1.tar.gz dce1ea9f82cf436830567894e7ee622f libprelude-1.0.1.tar.gz Size: 2791973 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: clutter: clutter-1.14.4.tar.xz
Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/clutter/1.14/clutter-1.14.4.tar.xz c072e4c27e69368f2b877ea4f6da2cdf clutter-1.14.4.tar.xz Size: 5095688 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/automake] - updated to 1.13.2
commit b794edd654ef14683b8a24f2c078403f8dd99d26 Author: Jakub Bogusz qbo...@pld-linux.org Date: Fri May 17 16:01:15 2013 +0200 - updated to 1.13.2 automake.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/automake.spec b/automake.spec index c00466f..416d0b9 100644 --- a/automake.spec +++ b/automake.spec @@ -14,13 +14,13 @@ Summary(ru.UTF-8): GNU automake - инструменты для автомати Summary(tr.UTF-8): Makefile yapılandırma araçları Summary(uk.UTF-8): GNU automake - інструменти для автоматичної генерації Makefile'ів Name: automake -Version: 1.13.1 +Version: 1.13.2 Release: 1 Epoch: 1 License: GPL v2+ Group: Development/Building Source0: http://ftp.gnu.org/gnu/automake/%{name}-%{version}.tar.xz -# Source0-md5: a60380ab11e1481376b7747d1b42ced2 +# Source0-md5: 497f3ea7e85504fe5b1b1b6d27cc71f1 Patch0:%{name}-info.patch Patch1:%{name}-man.patch Patch2:%{name}-no_versioned_dir.patch gitweb: http://git.pld-linux.org/gitweb.cgi/packages/automake.git/commitdiff/b794edd654ef14683b8a24f2c078403f8dd99d26 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: automake: automake-1.13.2.tar.xz
Files fetched: 1 STORED: http://ftp.gnu.org/gnu/automake/automake-1.13.2.tar.xz 497f3ea7e85504fe5b1b1b6d27cc71f1 automake-1.13.2.tar.xz Size: 1439596 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/mutter] - updated to 3.8.2
commit 7b3e5cc2e26ad20f56c1c1cb4149f493f2011f93 Author: Jakub Bogusz qbo...@pld-linux.org Date: Fri May 17 16:31:42 2013 +0200 - updated to 3.8.2 mutter.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/mutter.spec b/mutter.spec index 9c75f1d..5a1ffc6 100644 --- a/mutter.spec +++ b/mutter.spec @@ -5,12 +5,12 @@ Summary: Window and compositing manager based on Clutter Summary(pl.UTF-8): Zarządca okien i składania oparty na bibliotece Clutter Name: mutter -Version: 3.8.1 +Version: 3.8.2 Release: 1 License: GPL v2+ Group: X11/Window Managers Source0: http://ftp.gnome.org/pub/GNOME/sources/mutter/3.8/%{name}-%{version}.tar.xz -# Source0-md5: 082dca083a59231664f7bc9bc320acae +# Source0-md5: b61374f2b8f978c99c2e8d00b7774255 URL: http://git.gnome.org/cgit/mutter BuildRequires: autoconf = 2.50 BuildRequires: automake = 1:1.11 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/mutter.git/commitdiff/7b3e5cc2e26ad20f56c1c1cb4149f493f2011f93 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: mutter: mutter-3.8.2.tar.xz
Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/mutter/3.8/mutter-3.8.2.tar.xz b61374f2b8f978c99c2e8d00b7774255 mutter-3.8.2.tar.xz Size: 1733344 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/battleships] - up to 2.9
commit bd68e8bdbcac582a5e97f4e03b6afb20bdb7cdae Author: Lukasz Glebicki ble...@pld-linux.org Date: Fri May 17 16:37:04 2013 +0200 - up to 2.9 battleships.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/battleships.spec b/battleships.spec index cf7f317..1500927 100644 --- a/battleships.spec +++ b/battleships.spec @@ -1,12 +1,12 @@ Summary: Battleships against the computer (character-cell graphics) Summary(pl.UTF-8): Gra w statki przeciwko komputerowi Name: battleships -Version: 2.8 -Release: 2 +Version: 2.9 +Release: 1 License: GPL Group: Applications/Games Source0: http://www.catb.org/~esr/bs/bs-%{version}.tar.gz -# Source0-md5: 3add0396d1e7f98c20267634f41a87b1 +# Source0-md5: 4d4eec59c1789cffacf367d993e724f4 Patch0:%{name}-ldflags.patch URL: http://www.catb.org/~esr/bs/ BuildRequires: ncurses-devel gitweb: http://git.pld-linux.org/gitweb.cgi/packages/battleships.git/commitdiff/bd68e8bdbcac582a5e97f4e03b6afb20bdb7cdae ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: battleships: bs-2.9.tar.gz
Files fetched: 1 STORED: http://www.catb.org/~esr/bs/bs-2.9.tar.gz 4d4eec59c1789cffacf367d993e724f4 bs-2.9.tar.gz Size: 14922 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/xpra] - up to 0.9.2
commit b98ebb4322cd3a208b350d2ef05852356a27928a Author: Lukasz Glebicki ble...@pld-linux.org Date: Fri May 17 16:41:25 2013 +0200 - up to 0.9.2 xpra.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/xpra.spec b/xpra.spec index 6f56a8e..43678a3 100644 --- a/xpra.spec +++ b/xpra.spec @@ -3,11 +3,11 @@ # - subpackages for client/server, see http://xpra.org/dev.html Summary: Xpra gives you persistent remote applications for X Name: xpra -Version: 0.9.0 +Version: 0.9.2 Release: 1 License: GPL v2+ Source0: http://xpra.org/src/%{name}-%{version}.tar.xz -# Source0-md5: ada00b0f8ba86b5b95e1fc2fa5fcfaf4 +# Source0-md5: 8de43238841a6b47e597bcd53ee06c13 Group: Networking URL: http://xpra.org/ BuildRequires: ffmpeg-devel gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xpra.git/commitdiff/b98ebb4322cd3a208b350d2ef05852356a27928a ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: xpra: xpra-0.9.2.tar.xz
Files fetched: 1 STORED: http://xpra.org/src/xpra-0.9.2.tar.xz 8de43238841a6b47e597bcd53ee06c13 xpra-0.9.2.tar.xz Size: 561168 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/yaz] - up to 4.2.57
commit 67ccbfb00b6e0f27ef26abf5be6a4d0c53c4d076 Author: Lukasz Glebicki ble...@pld-linux.org Date: Fri May 17 16:46:28 2013 +0200 - up to 4.2.57 yaz.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/yaz.spec b/yaz.spec index 7fe66f4..bb552f8 100644 --- a/yaz.spec +++ b/yaz.spec @@ -1,12 +1,12 @@ Summary: Z39.50 protocol support library Summary(pl.UTF-8): Biblioteka obsługująca protokół Z39.50 Name: yaz -Version: 4.2.56 +Version: 4.2.57 Release: 1 License: BSD-like Group: Libraries Source0: http://ftp.indexdata.dk/pub/yaz/%{name}-%{version}.tar.gz -# Source0-md5: 37a1f952b8a89078afa53431da9fcdeb +# Source0-md5: 2e6994b6f3448be214c36097ab9362f7 URL: http://www.indexdata.dk/yaz/ BuildRequires: autoconf = 2.60 BuildRequires: automake = 1:1.9 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/yaz.git/commitdiff/67ccbfb00b6e0f27ef26abf5be6a4d0c53c4d076 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: yaz: yaz-4.2.57.tar.gz
Files fetched: 1 STORED: http://ftp.indexdata.dk/pub/yaz/yaz-4.2.57.tar.gz 2e6994b6f3448be214c36097ab9362f7 yaz-4.2.57.tar.gz Size: 2440476 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/adobe-flash] - up to 11.2.202.285; fixes CVE-2013-2728, CVE-2013-3324, CVE-2013-3325, CVE-2013-3326, CVE-2013-3
commit ad69bdf5ba09af5ab3e3bbcbdf85ec479ca58b11 Author: Kacper Kornet drae...@pld-linux.org Date: Thu May 16 18:29:43 2013 +0100 - up to 11.2.202.285; fixes CVE-2013-2728, CVE-2013-3324, CVE-2013-3325, CVE-2013-3326, CVE-2013-3327, CVE-2013-3328, CVE-2013-3329, CVE-2013-3330, CVE-2013-3331, CVE-2013-3332, CVE-2013-, CVE-2013-3334, CVE-2013-3335 adobe-flash.spec | 8 1 file changed, 4 insertions(+), 4 deletions(-) --- diff --git a/adobe-flash.spec b/adobe-flash.spec index 3bdf1b8..8278433 100644 --- a/adobe-flash.spec +++ b/adobe-flash.spec @@ -4,8 +4,8 @@ # Conditional build: %bcond_withlicense_agreement # generates package -%definever32 11.2.202.280 -%definever64 11.2.202.280 +%definever32 11.2.202.285 +%definever64 11.2.202.285 %ifarch %{ix86} %defineversion %{ver32} @@ -32,10 +32,10 @@ License:Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} Source0: http://fpdownload.macromedia.com/get/flashplayer/pdc/%{ver32}/install_flash_player_11_linux.i386.tar.gz?/flash-%{version}.tgz -# NoSourceSource0-md5: aecd83b5de3e021a453d7ddcfd442f0b +# NoSource0-md5: 4e3691afc05486be0258e66186d13644 NoSource: 0 Source1: http://fpdownload.macromedia.com/get/flashplayer/pdc/%{ver64}/install_flash_player_11_linux.x86_64.tar.gz?/flash64-%{version}.tgz -# NoSourceSource1-md5: d0a35620a3e54f6fa9e4c64b7c3d095f +# NoSource1-md5: 3fe4e07a3ddf07fd2c7c3b7b8b4cf5b4 NoSource: 1 %else Source3: http://svn.pld-linux.org/svn/license-installer/license-installer.sh gitweb: http://git.pld-linux.org/gitweb.cgi/packages/adobe-flash.git/commitdiff/ad69bdf5ba09af5ab3e3bbcbdf85ec479ca58b11 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/VirtualBox-bin] - fix NoSource0-md5 lines
commit efdf96bd03c5e75105acd530b2358ead38fc4544 Author: Kacper Kornet drae...@pld-linux.org Date: Fri May 17 16:17:58 2013 +0100 - fix NoSource0-md5 lines VirtualBox-bin.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/VirtualBox-bin.spec b/VirtualBox-bin.spec index 8c834a1..f4e2ff6 100644 --- a/VirtualBox-bin.spec +++ b/VirtualBox-bin.spec @@ -26,10 +26,10 @@ Release:%{rel} License: Free for non-commercial use, non-distributable Group: Applications/Emulators Source0: http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}-%{prev}-Linux_amd64.run -# NoSourceSource0-md5: +# NoSource0-md5: NoSource: 0 Source1: http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}-%{prev}-Linux_x86.run -# NoSourceSource1-md5: +# NoSource1-md5: NoSource: 1 Source2: http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf # Source2-md5: d41d8cd98f00b204e9800998ecf8427e gitweb: http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox-bin.git/commitdiff/efdf96bd03c5e75105acd530b2358ead38fc4544 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: VirtualBox-bin: ERRORS: UserManual.pdf
FATAL: http://download.virtualbox.org/virtualbox/4.1.0/UserManual.pdf md5 mismatch, needed d41d8cd98f00b204e9800998ecf8427e, got 24056c13ddbe2c9b5d135e8c96a53a11 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/chromium-browser-bin] - fix NoSource-md5 lines
commit 5f30e26b7a72c9e682926c902c71586988d18f8c Author: Kacper Kornet drae...@pld-linux.org Date: Fri May 17 16:20:00 2013 +0100 - fix NoSource-md5 lines chromium-browser-bin.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/chromium-browser-bin.spec b/chromium-browser-bin.spec index 664c22f..2421a11 100644 --- a/chromium-browser-bin.spec +++ b/chromium-browser-bin.spec @@ -10,9 +10,9 @@ License: BSD, LGPL v2+ (ffmpeg) Group: X11/Applications/Networking # sh get_sources.sh Source0: chromium-browser32-r%{svnrev}.zip -# NoSourceSource0-md5: +# NoSource0-md5: Source1: chromium-browser64-r%{svnrev}.zip -# NoSourceSource1-md5: +# NoSource1-md5: NoSource: 0 NoSource: 1 Source2: chromium-browser.sh gitweb: http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser-bin.git/commitdiff/5f30e26b7a72c9e682926c902c71586988d18f8c ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/crafty] - fix NoSource1-md5 line
commit 5eb1f3f76dd9e3a4a00324da1425d76f8d484e83 Author: Kacper Kornet drae...@pld-linux.org Date: Fri May 17 16:21:24 2013 +0100 - fix NoSource1-md5 line crafty.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/crafty.spec b/crafty.spec index e371240..5e5520d 100644 --- a/crafty.spec +++ b/crafty.spec @@ -11,7 +11,7 @@ Group:Applications/Games Source0: ftp://ftp.cis.uab.edu/pub/hyatt/source/%{name}-%{version}.zip # Source0-md5: 7e0811dd2d801428d8da48a4e487885a Source1: ftp://ftp.cis.uab.edu/pub/hyatt/documentation/%{name}.doc.ascii -# NoSourceSource1-md5: 5fd73027a1de1674763562e1987197ba +# NoSource1-md5: 5fd73027a1de1674763562e1987197ba Source2: ftp://ftp.cis.uab.edu/pub/hyatt/documentation/%{name}.doc.ps # Source2-md5: 6cef69aa2f9ea1ceb74b6c14edc8291f Source3: %{name}.desktop gitweb: http://git.pld-linux.org/gitweb.cgi/packages/crafty.git/commitdiff/5eb1f3f76dd9e3a4a00324da1425d76f8d484e83 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/poppler] - up to 0.22.4
commit bdc13fa55f3620545b90a561d2a40c11f2bf8ef6 Author: Kacper Kornet drae...@pld-linux.org Date: Fri May 17 17:22:44 2013 +0100 - up to 0.22.4 poppler.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/poppler.spec b/poppler.spec index 77a21d8..6f0bfb5 100644 --- a/poppler.spec +++ b/poppler.spec @@ -11,12 +11,12 @@ Summary: PDF rendering library Summary(pl.UTF-8): Biblioteka renderująca PDF Name: poppler -Version: 0.22.3 +Version: 0.22.4 Release: 1 License: GPL v2+ Group: Libraries Source0: http://poppler.freedesktop.org/%{name}-%{version}.tar.gz -# Source0-md5: be915388eaad6865cee5a156c8119ec1 +# Source0-md5: 49d55921ce795778c7231fe9f2fe923b URL: http://poppler.freedesktop.org/ %{?with_qt4:BuildRequires: QtGui-devel = 4.4.0} %{?with_qt4:BuildRequires: QtTest-devel = 4.4.0} @@ -310,7 +310,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README* TODO %attr(755,root,root) %{_libdir}/libpoppler.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libpoppler.so.36 +%attr(755,root,root) %ghost %{_libdir}/libpoppler.so.37 %files devel %defattr(644,root,root,755) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/poppler.git/commitdiff/bdc13fa55f3620545b90a561d2a40c11f2bf8ef6 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: poppler: poppler-0.22.4.tar.gz
Files fetched: 1 STORED: http://poppler.freedesktop.org/poppler-0.22.4.tar.gz 49d55921ce795778c7231fe9f2fe923b poppler-0.22.4.tar.gz Size: 528 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/gdal] - release 10 (rebuild with libpoppler.so.37)
commit fb7969fbf75b4ec4f1c79d7408c2018ac5f51a01 Author: Kacper Kornet drae...@pld-linux.org Date: Fri May 17 17:34:46 2013 +0100 - release 10 (rebuild with libpoppler.so.37) gdal.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/gdal.spec b/gdal.spec index af23213..7922b9e 100644 --- a/gdal.spec +++ b/gdal.spec @@ -43,7 +43,7 @@ Summary: Geospatial Data Abstraction Library Summary(pl.UTF-8): Biblioteka abstrakcji danych dotyczących powierzchni Ziemi Name: gdal Version: 1.9.2 -Release: 9 +Release: 10 License: BSD-like Group: Libraries Source0: ftp://ftp.remotesensing.org/gdal/%{name}-%{version}.tar.gz gitweb: http://git.pld-linux.org/gitweb.cgi/packages/gdal.git/commitdiff/fb7969fbf75b4ec4f1c79d7408c2018ac5f51a01 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/inkscape] - release 2 (rebuild with libpoppler.so.37)
commit 9ddab4c87b7606f5634ef2db68ed6dac19d77d65 Author: Kacper Kornet drae...@pld-linux.org Date: Fri May 17 17:38:43 2013 +0100 - release 2 (rebuild with libpoppler.so.37) inkscape.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/inkscape.spec b/inkscape.spec index b9ae355..831a46c 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -16,7 +16,7 @@ Summary: Scalable vector graphics editor Summary(pl.UTF-8): Edytor skalowalnej grafiki wektorowej Name: inkscape Version: 0.48.4 -Release: 1 +Release: 2 License: GPL v2+, LGPL v2.1+ Group: X11/Applications/Graphics Source0: http://downloads.sourceforge.net/inkscape/%{name}-%{version}%{beta}.tar.bz2 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/inkscape.git/commitdiff/9ddab4c87b7606f5634ef2db68ed6dac19d77d65 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/gnome-commander] - release 7 (rebuild with libpoppler.so.37)
commit 94350d8be29f41127ebaeddee0e240e154c1 Author: Kacper Kornet drae...@pld-linux.org Date: Fri May 17 17:39:36 2013 +0100 - release 7 (rebuild with libpoppler.so.37) gnome-commander.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/gnome-commander.spec b/gnome-commander.spec index 5b0e7d6..391de93 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -2,7 +2,7 @@ Summary:A GNOME filemanager similar to the Midnight Commander Summary(pl.UTF-8): Zarządca plików dla środowiska GNOME w stylu Midnight Commandera Name: gnome-commander Version: 1.2.8.15 -Release: 6 +Release: 7 License: GPL v2+ Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/%{name}-%{version}.tar.xz gitweb: http://git.pld-linux.org/gitweb.cgi/packages/gnome-commander.git/commitdiff/94350d8be29f41127ebaeddee0e240e154c1 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/kde4-calligra] - release 3 (rebuild with libpoppler.so.37)
commit f5e506f22626b99d6132a14ea78291a70cfceede Author: Kacper Kornet drae...@pld-linux.org Date: Fri May 17 17:40:24 2013 +0100 - release 3 (rebuild with libpoppler.so.37) kde4-calligra.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/kde4-calligra.spec b/kde4-calligra.spec index 4b63a6b..33209f6 100644 --- a/kde4-calligra.spec +++ b/kde4-calligra.spec @@ -28,7 +28,7 @@ Summary: Calligra - powerful office suite for KDE Summary(pl.UTF-8): Calligra - potężny pakiet biurowy dla KDE Name: kde4-calligra Version: 2.6.3 -Release: 2 +Release: 3 License: GPL/LGPL Group: X11/Applications Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{orgname}-%{version}/%{orgname}-%{version}.tar.bz2 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/kde4-calligra.git/commitdiff/f5e506f22626b99d6132a14ea78291a70cfceede ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/gnome-shell] Up to 3.8.2
commit 92c114ba4a8e54987367dd67199bc9ce94388be3 Author: Artur Frysiak ar...@frysiak.net Date: Fri May 17 19:08:56 2013 +0200 Up to 3.8.2 gnome-shell.spec | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) --- diff --git a/gnome-shell.spec b/gnome-shell.spec index 7be68ff..af87215 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -12,7 +12,7 @@ %definegtk_version 3.7.9 %definejson_glib_version 0.13.90 %definelibcroco_version 0.6.8 -%definemutter_version 3.8.1 +%definemutter_version 3.8.2 %definenetworkmanager_version 0.9.6 %definepolkit_version 0.100 %definepulseaudio_version 2.0 @@ -21,12 +21,12 @@ Summary: Window manager and application launcher for GNOME Name: gnome-shell -Version: 3.8.1 -Release: 2 +Version: 3.8.2 +Release: 1 License: GPL v2+ Group: X11/Window Managers Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/3.8/%{name}-%{version}.tar.xz -# Source0-md5: f225e73c40fd695ae1755ceff54fea0f +# Source0-md5: 0fb61fa065d580163c041ed824c3b2bb URL: http://live.gnome.org/GnomeShell BuildRequires: NetworkManager-devel = %{networkmanager_version} BuildRequires: NetworkManager-gtk-lib-devel = %{networkmanager_version} @@ -206,6 +206,7 @@ fi %{_libdir}/gnome-shell/ShellJS-0.1.typelib %{_libdir}/gnome-shell/St-1.0.typelib %{_datadir}/GConf/gsettings/gnome-shell-overrides.convert +%{_datadir}/dbus-1/interfaces/org.gnome.Shell.Screencast.xml %{_datadir}/dbus-1/interfaces/org.gnome.Shell.Screenshot.xml %{_datadir}/dbus-1/interfaces/org.gnome.ShellSearchProvider.xml %{_datadir}/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml gitweb: http://git.pld-linux.org/gitweb.cgi/packages/gnome-shell.git/commitdiff/92c114ba4a8e54987367dd67199bc9ce94388be3 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: gnome-shell: gnome-shell-3.8.2.tar.xz
Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/3.8/gnome-shell-3.8.2.tar.xz 0fb61fa065d580163c041ed824c3b2bb gnome-shell-3.8.2.tar.xz Size: 1512268 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/evas-loaders-generic] - release 3 (rebuild with libpoppler.so.37)
commit 1d16ed8b7b5d9c9415dc2f1f81f6b8f8a7e93ad0 Author: Kacper Kornet drae...@pld-linux.org Date: Fri May 17 18:57:36 2013 +0100 - release 3 (rebuild with libpoppler.so.37) evas-loaders-generic.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/evas-loaders-generic.spec b/evas-loaders-generic.spec index 2cf2758..e43e290 100644 --- a/evas-loaders-generic.spec +++ b/evas-loaders-generic.spec @@ -2,7 +2,7 @@ Summary:Generic loaders for Evas library Summary(pl.UTF-8): Ogólne programy wczytujące dla biblioteki Evas Name: evas-loaders-generic Version: 1.7.6 -Release: 2 +Release: 3 License: GPL v2 Group: Libraries Source0: http://download.enlightenment.org/releases/evas_generic_loaders-%{version}.tar.bz2 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/evas-loaders-generic.git/commitdiff/1d16ed8b7b5d9c9415dc2f1f81f6b8f8a7e93ad0 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/libreoffice] - update BRs
commit 529bbf238e92cc48ad9fc6ec678d4720ce826f80 Author: Kacper Kornet drae...@pld-linux.org Date: Fri May 17 19:03:50 2013 +0100 - update BRs libreoffice.spec | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) --- diff --git a/libreoffice.spec b/libreoffice.spec index 624ebcb..aed5021 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -91,6 +91,7 @@ BuildRequires:autoconf = 2.51 BuildRequires: automake = 1:1.9 BuildRequires: bash BuildRequires: bison = 1.875-4 +BuildRequires: bluez-libs-devel BuildRequires: boost-devel = 1.35.0 BuildRequires: cairo-devel = 1.2.0 %{?with_ccache:BuildRequires: ccache} @@ -107,8 +108,8 @@ BuildRequires: freetype-devel = 2.1 BuildRequires: glib2-devel = 2.13.5 BuildRequires: gperf BuildRequires: graphite2-devel -BuildRequires: gstreamer-devel = 0.10.0 -BuildRequires: gstreamer-plugins-base-devel = 0.10.0 +BuildRequires: gstreamer0.10-devel = 0.10.0 +BuildRequires: gstreamer0.10-plugins-base-devel = 0.10.0 BuildRequires: gtk+2-devel = 2:2.10 %{?with_system_hunspell:BuildRequires: hunspell-devel =1.2.2} BuildRequires: hyphen-devel @@ -180,9 +181,9 @@ BuildRequires: postgresql-devel BuildRequires: poppler-cpp-devel = 0.8.0 BuildRequires: poppler-devel = 0.8.0 BuildRequires: portaudio-devel -BuildRequires: python = 2.2 -BuildRequires: python-devel = 2.2 -BuildRequires: python-modules = 2.2 +BuildRequires: python3 = 3.3 +BuildRequires: python3-devel = 3.3 +BuildRequires: python3-modules = 3.3 BuildRequires: redland-devel BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) = 1.660 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/libreoffice.git/commitdiff/529bbf238e92cc48ad9fc6ec678d4720ce826f80 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/baobab] - updated to 3.8.2
commit c5721e98c1b818ec226dcb47700832055f35f932 Author: Łukasz Kieś kie...@pld-linux.org Date: Fri May 17 20:16:13 2013 +0200 - updated to 3.8.2 baobab.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/baobab.spec b/baobab.spec index ec73011..14f6486 100644 --- a/baobab.spec +++ b/baobab.spec @@ -1,12 +1,12 @@ Summary: Graphical directory tree analyzer Summary(pl.UTF-8): Graficzny analizator drzew katalogów Name: baobab -Version: 3.8.1 +Version: 3.8.2 Release: 1 License: GPL v2 Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/baobab/3.8/%{name}-%{version}.tar.xz -# Source0-md5: 2e581b3c65ffd25ea22c76e7d12c2f0f +# Source0-md5: 768edf897d3626140a56a568b7083241 Patch0:%{name}-desktop.patch URL: http://live.gnome.org/GnomeUtils BuildRequires: autoconf = 2.63 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/baobab.git/commitdiff/c5721e98c1b818ec226dcb47700832055f35f932 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: baobab: baobab-3.8.2.tar.xz
Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/baobab/3.8/baobab-3.8.2.tar.xz 768edf897d3626140a56a568b7083241 baobab-3.8.2.tar.xz Size: 1038052 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/cheese] - updated to 3.8.2
commit ff5f7f90770a0418f6d45320a926faf8bdd0d889 Author: Łukasz Kieś kie...@pld-linux.org Date: Fri May 17 20:20:43 2013 +0200 - updated to 3.8.2 cheese.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/cheese.spec b/cheese.spec index f7fc583..5a0c9f3 100644 --- a/cheese.spec +++ b/cheese.spec @@ -1,12 +1,12 @@ Summary: A cheesy program to take pictures and videos from your web cam Summary(pl.UTF-8): Program do pobierania zdjęć i filmów z kamery internetowej Name: cheese -Version: 3.8.1 +Version: 3.8.2 Release: 1 License: GPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/cheese/3.8/%{name}-%{version}.tar.xz -# Source0-md5: 2d10f7ddfdb54517fce292ab84fa8527 +# Source0-md5: 06f406a105e0480d4b5c326141ab3f96 URL: http://projects.gnome.org/cheese/ BuildRequires: autoconf = 2.64 BuildRequires: automake = 1:1.11 @@ -82,8 +82,8 @@ Summary: Cheese header files Summary(pl.UTF-8): Pliki nagłówkowe Cheese Group: X11/Development/Libraries Requires: %{name}-libs = %{version}-%{release} -Requires: gstreamer-plugins-base-devel = 1.0.0 Requires: gstreamer-plugins-bad-devel = 1.0.0 +Requires: gstreamer-plugins-base-devel = 1.0.0 Requires: gtk+3-devel = 3.4.4 Requires: libcanberra-gtk3-devel = 0.26 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/cheese.git/commitdiff/ff5f7f90770a0418f6d45320a926faf8bdd0d889 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: cheese: cheese-3.8.2.tar.xz
Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/cheese/3.8/cheese-3.8.2.tar.xz 06f406a105e0480d4b5c326141ab3f96 cheese-3.8.2.tar.xz Size: 3730600 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/devhelp] - updated to 3.8.2
commit a79b1e1c148827d15bec1ce6895d51655dfdd9d9 Author: Łukasz Kieś kie...@pld-linux.org Date: Fri May 17 20:25:23 2013 +0200 - updated to 3.8.2 devhelp.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/devhelp.spec b/devhelp.spec index 7c32dfc..04d48b0 100644 --- a/devhelp.spec +++ b/devhelp.spec @@ -1,12 +1,12 @@ Summary: API documentation browser for GNOME Summary(pl.UTF-8): Przeglądarka dokumentacji API dla GNOME Name: devhelp -Version: 3.8.1 +Version: 3.8.2 Release: 1 License: GPL v2+ Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/devhelp/3.8/%{name}-%{version}.tar.xz -# Source0-md5: 3be550a493eb78f0f4dc1b3f94d62049 +# Source0-md5: 9dfdc303fad56abeb6d8d6a69afd36bd Patch0:%{name}-bookdir.patch Patch1:%{name}-use-python3.patch URL: http://www.imendio.com/projects/devhelp/ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/devhelp.git/commitdiff/a79b1e1c148827d15bec1ce6895d51655dfdd9d9 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: devhelp: devhelp-3.8.2.tar.xz
Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/devhelp/3.8/devhelp-3.8.2.tar.xz 9dfdc303fad56abeb6d8d6a69afd36bd devhelp-3.8.2.tar.xz Size: 503632 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/eog] - updated to 3.8.2
commit 36bad928d6691492a49f6d975f20a19723cc87a5 Author: Łukasz Kieś kie...@pld-linux.org Date: Fri May 17 20:30:11 2013 +0200 - updated to 3.8.2 eog.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/eog.spec b/eog.spec index 534dade..4d64f16 100644 --- a/eog.spec +++ b/eog.spec @@ -6,12 +6,12 @@ Summary: The Eye of GNOME image viewer Summary(pl.UTF-8): Oko GNOME - przeglądarka obrazków Summary(pt_BR.UTF-8): Visualizador de imagem Eye of GNOME Name: eog -Version: 3.8.0 +Version: 3.8.2 Release: 1 License: GPL v2+ Group: X11/Applications/Graphics Source0: http://ftp.gnome.org/pub/GNOME/sources/eog/3.8/%{name}-%{version}.tar.xz -# Source0-md5: 694e430680553b97475b7f6e3508a5d3 +# Source0-md5: 84c48f8468b8cee09379091d11b553ca URL: http://www.gnome.org/projects/eog/ BuildRequires: autoconf = 2.59 BuildRequires: automake = 1:1.11 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/eog.git/commitdiff/36bad928d6691492a49f6d975f20a19723cc87a5 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: eog: eog-3.8.2.tar.xz
Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/eog/3.8/eog-3.8.2.tar.xz 84c48f8468b8cee09379091d11b553ca eog-3.8.2.tar.xz Size: 3626260 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/evince] - updated to 3.8.2
commit 7ad251b73c3604b86239618bdce0916ee9b2d19b Author: Łukasz Kieś kie...@pld-linux.org Date: Fri May 17 20:36:56 2013 +0200 - updated to 3.8.2 evince.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/evince.spec b/evince.spec index ddda4cd..fa92ba5 100644 --- a/evince.spec +++ b/evince.spec @@ -10,12 +10,12 @@ Summary: Document viewer for multiple document formats Summary(pl.UTF-8): Przeglądarka dokumentów w wielu formatach Name: evince -Version: 3.8.0 +Version: 3.8.2 Release: 1 License: GPL v2 Group: X11/Applications/Graphics Source0: http://ftp.gnome.org/pub/GNOME/sources/evince/3.8/%{name}-%{version}.tar.xz -# Source0-md5: 1f48bc498d1840c08fedb91b21687539 +# Source0-md5: 5792485f6cab925ebdf7ae7fd9d93028 Patch0:%{name}-linking.patch URL: http://www.gnome.org/projects/evince/ BuildRequires: autoconf = 2.57 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/evince.git/commitdiff/7ad251b73c3604b86239618bdce0916ee9b2d19b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: evince: evince-3.8.2.tar.xz
Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/evince/3.8/evince-3.8.2.tar.xz 5792485f6cab925ebdf7ae7fd9d93028 evince-3.8.2.tar.xz Size: 6477880 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/file-roller] - updated to 3.8.2
commit 8001256fc8757726c89f38e5a703194d37457eef Author: Łukasz Kieś kie...@pld-linux.org Date: Fri May 17 20:42:11 2013 +0200 - updated to 3.8.2 file-roller.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/file-roller.spec b/file-roller.spec index 8461d1e..3b1c137 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -2,12 +2,12 @@ Summary: An archive manager for GNOME Summary(pl.UTF-8): Zarządca archiwów dla GNOME Summary(pt_BR.UTF-8): Gerenciador de arquivos compactados para o GNOME Name: file-roller -Version: 3.8.1 +Version: 3.8.2 Release: 1 License: GPL v2+ Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/file-roller/3.8/%{name}-%{version}.tar.xz -# Source0-md5: e28ef39cd5ae7461bd9ac181ab81283f +# Source0-md5: 466a8789aeb1b14cc445f8d07ebf327b Patch0:%{name}-magic.patch URL: http://www.gnome.org/ BuildRequires: autoconf = 2.68 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/file-roller.git/commitdiff/8001256fc8757726c89f38e5a703194d37457eef ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: file-roller: file-roller-3.8.2.tar.xz
Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/file-roller/3.8/file-roller-3.8.2.tar.xz 466a8789aeb1b14cc445f8d07ebf327b file-roller-3.8.2.tar.xz Size: 1510532 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] - add fix for backwards-incompatible change in SysLogHandler (fixes http://bugs.python.org/issue17
commit a35a64a86b91d5ca2e09f507d7ebc4a68d3081fb Author: Kacper Kornet drae...@pld-linux.org Date: Fri May 17 19:48:33 2013 +0100 - add fix for backwards-incompatible change in SysLogHandler (fixes http://bugs.python.org/issue17795) python-sysloghandler.patch | 99 ++ python.spec| 4 +- 2 files changed, 102 insertions(+), 1 deletion(-) --- diff --git a/python.spec b/python.spec index 586ee14..47646d7 100644 --- a/python.spec +++ b/python.spec @@ -43,7 +43,7 @@ Summary(tr.UTF-8):X arayüzlü, yüksek düzeyli, kabuk yorumlayıcı dili Summary(uk.UTF-8): Мова програмування дуже високого рівня з X-інтерфейсом Name: python Version: %{py_ver}.4 -Release: 2 +Release: 3 Epoch: 1 License: PSF Group: Development/Languages/Python @@ -58,6 +58,7 @@ Patch3: %{name}-lib64.patch Patch4:%{name}-noarch_to_datadir.patch Patch5:%{name}-verbose.patch Patch6:%{name}-distro.patch +Patch7:%{name}-sysloghandler.patch URL: http://www.python.org/ BuildRequires: autoconf = 2.65 BuildRequires: automake @@ -557,6 +558,7 @@ Przykłady te są dla Pythona 2.3.4, nie %{version}. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 tar xjf %{SOURCE1} diff --git a/python-sysloghandler.patch b/python-sysloghandler.patch new file mode 100644 index 000..9377b05 --- /dev/null +++ b/python-sysloghandler.patch @@ -0,0 +1,99 @@ + +# HG changeset patch +# User Vinay Sajip vinay_sa...@yahoo.co.uk +# Date 1366621131 -3600 +# Node ID 32a5de0e91d5612dca65d5d34f5e142e493d6e62 +# Parent a1421d28393b4ee88965a747b92296bde81bae05 +Issue #17795: Reverted backwards-incompatible change in SysLogHandler with Unix domain sockets. + +diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py +--- a/Lib/logging/handlers.py b/Lib/logging/handlers.py +@@ -1,4 +1,4 @@ +-# Copyright 2001-2012 by Vinay Sajip. All Rights Reserved. ++# Copyright 2001-2013 by Vinay Sajip. All Rights Reserved. + # + # Permission to use, copy, modify, and distribute this software and its + # documentation for any purpose and without fee is hereby granted, +@@ -18,7 +18,7 @@ + Additional handlers for the logging package for Python. The core package is + based on PEP 282 and comments thereto in comp.lang.python. + +-Copyright (C) 2001-2012 Vinay Sajip. All Rights Reserved. ++Copyright (C) 2001-2013 Vinay Sajip. All Rights Reserved. + + To use, simply 'import logging.handlers' and log away! + +@@ -737,13 +737,17 @@ class SysLogHandler(logging.Handler): + } + + def __init__(self, address=('localhost', SYSLOG_UDP_PORT), +- facility=LOG_USER, socktype=socket.SOCK_DGRAM): ++ facility=LOG_USER, socktype=None): + + Initialize a handler. + + If address is specified as a string, a UNIX socket is used. To log to a + local syslogd, SysLogHandler(address=/dev/log) can be used. +-If facility is not specified, LOG_USER is used. ++If facility is not specified, LOG_USER is used. If socktype is ++specified as socket.SOCK_DGRAM or socket.SOCK_STREAM, that specific ++socket type will be used. For Unix sockets, you can also specify a ++socktype of None, in which case socket.SOCK_DGRAM will be used, falling ++back to socket.SOCK_STREAM. + + logging.Handler.__init__(self) + +@@ -756,18 +760,37 @@ class SysLogHandler(logging.Handler): + self._connect_unixsocket(address) + else: + self.unixsocket = 0 ++if socktype is None: ++socktype = socket.SOCK_DGRAM + self.socket = socket.socket(socket.AF_INET, socktype) + if socktype == socket.SOCK_STREAM: + self.socket.connect(address) ++self.socktype = socktype + self.formatter = None + + def _connect_unixsocket(self, address): +-self.socket = socket.socket(socket.AF_UNIX, self.socktype) ++use_socktype = self.socktype ++if use_socktype is None: ++use_socktype = socket.SOCK_DGRAM ++self.socket = socket.socket(socket.AF_UNIX, use_socktype) + try: + self.socket.connect(address) ++# it worked, so set self.socktype to the used type ++self.socktype = use_socktype + except socket.error: + self.socket.close() +-raise ++if self.socktype is not None: ++# user didn't specify falling back, so fail ++raise ++use_socktype = socket.SOCK_STREAM ++self.socket = socket.socket(socket.AF_UNIX, use_socktype) ++try: ++self.socket.connect(address) ++# it worked, so set self.socktype to the used type ++self.socktype = use_socktype ++
[packages/libreport] rename python bindings package to python-libreport
commit 00cca651bd657f029bc6db6f9960f700fb0d8ee3 Author: Elan Ruusamäe g...@delfi.ee Date: Fri May 17 21:57:40 2013 +0300 rename python bindings package to python-libreport libreport.spec | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) --- diff --git a/libreport.spec b/libreport.spec index 72cc03a..831c130 100644 --- a/libreport.spec +++ b/libreport.spec @@ -2,7 +2,7 @@ Summary:Generic library for reporting various problems Summary(pl.UTF-8): Ogólna biblioteka do zgłaszania różnych problemów Name: libreport Version: 2.1.3 -Release: 1 +Release: 2 License: GPL v2+ Group: Libraries Source0: https://fedorahosted.org/released/abrt/%{name}-%{version}.tar.gz @@ -87,16 +87,18 @@ Development headers for libreport-web. %description web-devel -l pl.UTF-8 Pliki nagłówkowe biblioteki libreport-web. -%package python +%package -n python-%{name} Summary: Python bindings for libreport libraries Summary(pl.UTF-8): Wiązania Pythona dla bibliotek libreport Group: Libraries/Python Requires: %{name} = %{version}-%{release} +Provides: %{name}-python = %{version}-%{release} +Obsoletes: libreport-python 2.1.3-1 -%description python +%description -n python-%{name} Python bindings for libreport libraries. -%description python -l pl.UTF-8 +%description -n python-%{name} -l pl.UTF-8 Wiązania Pythona dla bibliotek libreport %package cli @@ -373,7 +375,7 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/libreport/libreport_curl.h %{_pkgconfigdir}/libreport-web.pc -%files python +%files -n python-%{name} %defattr(644,root,root,755) %{py_sitedir}/report %{py_sitedir}/reportclient gitweb: http://git.pld-linux.org/gitweb.cgi/packages/libreport.git/commitdiff/00cca651bd657f029bc6db6f9960f700fb0d8ee3 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-meh] R: python-libreport
commit ec78cc81384ff857461adb4c68140067beac69ec Author: Elan Ruusamäe g...@delfi.ee Date: Fri May 17 22:00:42 2013 +0300 R: python-libreport python-meh.spec | 1 + 1 file changed, 1 insertion(+) --- diff --git a/python-meh.spec b/python-meh.spec index 83f91df..d1abb22 100644 --- a/python-meh.spec +++ b/python-meh.spec @@ -34,6 +34,7 @@ Requires: libreport-gtk = %{libreportver} Requires: openssh-clients Requires: python Requires: python-dbus +Requires: python-libreport = %{libreportver} Requires: python-pygobject3 Requires: python-rpm Requires: yum gitweb: http://git.pld-linux.org/gitweb.cgi/packages/python-meh.git/commitdiff/ec78cc81384ff857461adb4c68140067beac69ec ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/anaconda/anaconda-19] R: python-snack
commit 3763ecef35230f38adcd3bd3f564f0222e5bd388 Author: Elan Ruusamäe g...@delfi.ee Date: Fri May 17 22:02:16 2013 +0300 R: python-snack anaconda.spec | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) --- diff --git a/anaconda.spec b/anaconda.spec index a635868..6de247f 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -79,26 +79,27 @@ Requires: isomd5sum = %{isomd5sum} Requires: kbd Requires: libgnomekbd Requires: libreport-anaconda = 2.0.21-1 -Requires: libuser-python Requires: libxklavier Requires: nm-connection-editor Requires: ntpdate Requires: open-iscsi = %{iscsiver} Requires: parted = %{partedver} -Requires: pyparted = %{pypartedver} Requires: python-IPy Requires: python-babel Requires: python-blivet = 0.12 Requires: python-bugzilla Requires: python-dbus +Requires: python-libuser Requires: python-meh = %{mehver} Requires: python-nss +Requires: python-parted = %{pypartedver} Requires: python-pwquality Requires: python-pykickstart = %{pykickstartver} Requires: python-pytz Requires: python-rpm = %{rpmpythonver} Requires: python-selinux Requires: python-selinux = %{libselinuxver} +Requires: python-snack Requires: python-urlgrabber = %{pythonurlgrabberver} Requires: rsync Requires: system-logos @@ -162,7 +163,7 @@ anaconda runtime on NFS/HTTP/FTP servers or local disks. %prep %setup -q -# / on /usr kicks in +# / on %{_prefix} kicks in %{__sed} -i -e '1 s,#!/usr/bin/bash,#!/bin/sh,' scripts/run-anaconda # TODO: rpm5 porting gitweb: http://git.pld-linux.org/gitweb.cgi/packages/anaconda.git/commitdiff/3763ecef35230f38adcd3bd3f564f0222e5bd388 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/anaconda/anaconda-19] disable unavailable packages
commit 1658fc8342200b1c8b1272e78b9538a339d8f43a Author: Elan Ruusamäe g...@delfi.ee Date: Fri May 17 22:27:47 2013 +0300 disable unavailable packages anaconda.spec | 16 1 file changed, 8 insertions(+), 8 deletions(-) --- diff --git a/anaconda.spec b/anaconda.spec index 6de247f..fcde8d9 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -67,12 +67,12 @@ BuildRequires: yum = %{yumver} Requires: GConf2 = %{gconfversion} Requires: NetworkManager = %{nmver} Requires: anaconda-widgets = %{version}-%{release} -Requires: anaconda-yum-plugins -Requires: authconfig +#Requires: anaconda-yum-plugins +#Requires: authconfig Requires: chrony Requires: desktop-file-utils -Requires: dhclient -Requires: firewalld = %{firewalldver} +#Requires: dhclient +#Requires: firewalld = %{firewalldver} Requires: gnome-icon-theme-symbolic Requires: hostname Requires: isomd5sum = %{isomd5sum} @@ -80,14 +80,14 @@ Requires: kbd Requires: libgnomekbd Requires: libreport-anaconda = 2.0.21-1 Requires: libxklavier -Requires: nm-connection-editor +#Requires: nm-connection-editor Requires: ntpdate Requires: open-iscsi = %{iscsiver} Requires: parted = %{partedver} Requires: python-IPy Requires: python-babel Requires: python-blivet = 0.12 -Requires: python-bugzilla +#Requires: python-bugzilla Requires: python-dbus Requires: python-libuser Requires: python-meh = %{mehver} @@ -102,8 +102,8 @@ Requires: python-selinux = %{libselinuxver} Requires: python-snack Requires: python-urlgrabber = %{pythonurlgrabberver} Requires: rsync -Requires: system-logos -Requires: tigervnc-server-minimal +#Requires: system-logos +#Requires: tigervnc-server-minimal Requires: usermode Requires: util-linux = %{utillinuxver} Requires: yum = %{yumver} gitweb: http://git.pld-linux.org/gitweb.cgi/packages/anaconda.git/commitdiff/292c31438c4906d72678e4f68caa5cb798162564 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/anaconda/anaconda-19] use pld interfaces path
commit c17887b822674f3882d0850125102fe4d013b26c Author: Elan Ruusamäe g...@delfi.ee Date: Fri May 17 22:28:50 2013 +0300 use pld interfaces path anaconda.spec| 4 +++- interfaces-dir.patch | 34 ++ 2 files changed, 37 insertions(+), 1 deletion(-) --- diff --git a/anaconda.spec b/anaconda.spec index fcde8d9..a26732b 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -31,11 +31,12 @@ Summary:Graphical system installer Summary(pl.UTF-8): Graficzny instalator systemu Name: anaconda Version: 19.25 -Release: 0.5 +Release: 0.12 License: GPL Group: Applications/System Source0: http://pkgs.fedoraproject.org/repo/pkgs/anaconda/%{name}-%{version}.tar.bz2/b3f242b630aa1d4a458756b5816a0603/anaconda-%{version}.tar.bz2 # Source0-md5: b3f242b630aa1d4a458756b5816a0603 +Patch0:interfaces-dir.patch URL: http://fedoraproject.org/wiki/Anaconda BuildRequires: NetworkManager-devel = %{nmver} BuildRequires: audit-libs-devel @@ -162,6 +163,7 @@ anaconda runtime on NFS/HTTP/FTP servers or local disks. %prep %setup -q +%patch0 -p1 # / on %{_prefix} kicks in %{__sed} -i -e '1 s,#!/usr/bin/bash,#!/bin/sh,' scripts/run-anaconda diff --git a/interfaces-dir.patch b/interfaces-dir.patch new file mode 100644 index 000..9e778fd --- /dev/null +++ b/interfaces-dir.patch @@ -0,0 +1,34 @@ +--- anaconda-19.25/./pyanaconda/network.py~2013-05-09 19:08:04.0 +0300 anaconda-19.25/./pyanaconda/network.py 2013-05-17 22:18:14.386050536 +0300 +@@ -47,7 +47,7 @@ + log = logging.getLogger(anaconda) + + sysconfigDir = /etc/sysconfig +-netscriptsDir = %s/network-scripts % (sysconfigDir) ++netscriptsDir = %s/interfaces % (sysconfigDir) + networkConfFile = %s/network % (sysconfigDir) + hostnameFile = /etc/hostname + ipv6ConfFile = /etc/sysctl.d/anaconda.conf +@@ -593,9 +593,9 @@ + shutil.copy(file, destfile) + return True + +-# /etc/sysconfig/network-scripts/ifcfg-* +-# /etc/sysconfig/network-scripts/keys-* +-# TODO: routing info from /etc/sysconfig/network-scripts? ++# /etc/sysconfig/interfaces/ifcfg-* ++# /etc/sysconfig/interfaces/keys-* ++# TODO: routing info from /etc/sysconfig/interfaces? + def copyIfcfgFiles(destPath): + files = os.listdir(netscriptsDir) + for cfgFile in files: +--- anaconda-19.25/./data/post-scripts/80-setfilecons.ks~ 2013-04-25 19:10:47.0 +0300 anaconda-19.25/./data/post-scripts/80-setfilecons.ks 2013-05-17 22:19:18.165565949 +0300 +@@ -1,6 +1,6 @@ + %post + +-restorecon -ir /etc/sysconfig/network-scripts /var/lib /etc/lvm \ ++restorecon -ir /etc/sysconfig/interfaces /var/lib /etc/lvm \ +/dev /etc/iscsi /var/lib/iscsi /root /var/lock /var/log \ +/etc/modprobe.d /etc/sysconfig /var/cache/yum + gitweb: http://git.pld-linux.org/gitweb.cgi/packages/anaconda.git/commitdiff/292c31438c4906d72678e4f68caa5cb798162564 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/anaconda/anaconda-19] R: python-parted 3.9 for parted.DISK_GPT_PMBR_BOOT
commit 292c31438c4906d72678e4f68caa5cb798162564 Author: Elan Ruusamäe g...@delfi.ee Date: Fri May 17 22:39:56 2013 +0300 R: python-parted 3.9 for parted.DISK_GPT_PMBR_BOOT AttributeError: 'module' object has no attribute 'DISK_GPT_PMBR_BOOT' anaconda.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/anaconda.spec b/anaconda.spec index a26732b..834a5cf 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -10,7 +10,7 @@ %define pykickstartver 1.99.30 %define yumver 3.4.3-7 %define partedver 1.8.1 -%define pypartedver 2.5-2 +%define pypartedver 3.9 %define pythonpyblockver 0.45 %define nmver 1:0.7.1-3.git20090414 %define dbusver 1.2.3 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/anaconda.git/commitdiff/292c31438c4906d72678e4f68caa5cb798162564 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/mythtv] - exclude perl scripts that won't work without perl bindings - add perl deps - package missing dir -
commit 05d935fbff8e1acb30323a54dc0957cee8e5b5a5 Author: Jan Rękorajski bagg...@pld-linux.org Date: Fri May 17 22:28:38 2013 +0200 - exclude perl scripts that won't work without perl bindings - add perl deps - package missing dir - rel 2 mythtv.spec | 15 ++- 1 file changed, 14 insertions(+), 1 deletion(-) --- diff --git a/mythtv.spec b/mythtv.spec index 4859d11..738ac69 100644 --- a/mythtv.spec +++ b/mythtv.spec @@ -57,7 +57,7 @@ Summary: A personal video recorder (PVR) application Summary(pl.UTF-8): Osobista aplikacja do nagrywania obrazu (PVR) Name: mythtv Version: 0.26.0 -Release: 1 +Release: 2 License: GPL v2 Group: Applications/Multimedia Source0: ftp://ftp.osuosl.org/pub/mythtv/%{name}-%{version}.tar.bz2 @@ -106,6 +106,15 @@ BuildRequires: linux-libc-headers = 7:2.6.10 BuildRequires: mysql-devel BuildRequires: perl-devel BuildRequires: perl-tools-pod +%if %{with perl} +BuildRequires: perl-DBI +BuildRequires: perl-DBD-mysql +BuildRequires: perl-HTTP-Message +BuildRequires: perl-libwww +BuildRequires: perl-Net-UPnP-QueryResponse +BuildRequires: perl-Net-UPnP-ControlPoint +BuildRequires: perl-IO-Socket-INET6 +%endif BuildRequires: pkgconfig %{?with_pulseaudio:BuildRequires: pulseaudio-devel} BuildRequires: python-devel @@ -597,12 +606,16 @@ fi %dir %{_datadir}/mythtv %dir %{_datadir}/mythtv/themes %{_datadir}/mythtv/internetcontent +%if %{without perl} +%exclude %{_datadir}/mythtv/internetcontent/nv_perl_libs +%endif %{_datadir}/mythtv/metadata %dir %{_libdir}/mythtv %{_datadir}/mythtv/*.xml %dir %{_libdir}/mythtv/filters %dir %{_libdir}/mythtv/plugins %attr(755,root,root) %{_libdir}/mythtv/filters/*.so +%dir %{_datadir}/mythtv/fonts %{_datadir}/mythtv/fonts/*.ttf %{_datadir}/mythtv/fonts/*.otf %dir %{_datadir}/mythtv/i18n gitweb: http://git.pld-linux.org/gitweb.cgi/packages/mythtv.git/commitdiff/05d935fbff8e1acb30323a54dc0957cee8e5b5a5 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/mythtv] - enable python bindings - rel 3
commit 2529ba62dc5304d2c4d2bc03aae02be1921f917f Author: Jan Rękorajski bagg...@pld-linux.org Date: Fri May 17 22:45:28 2013 +0200 - enable python bindings - rel 3 mythtv.spec | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) --- diff --git a/mythtv.spec b/mythtv.spec index 738ac69..c12ee26 100644 --- a/mythtv.spec +++ b/mythtv.spec @@ -5,10 +5,8 @@ # - http://outflux.net/software/pkgs/mythtvfs-fuse/ # - vaapi support - check for compatible versions of libva? # - bindings: -# WARNING: disabling Python bindings; missing MySQLdb # WARNING: disabling Perl bindings; missing Net::UPnP::QueryResponse # WARNING: disabling Perl bindings; missing Net::UPnP::ControlPoint -# - dozen of unpackaged files # # Specfile for MythTV # @@ -36,7 +34,7 @@ %bcond_with dshowserver# enable directshow codecs server %bcond_withperl %bcond_withphp -%bcond_withpython +%bcond_without python %bcond_withnvidia_headers # build vdpau support with nvidia headers # instead of libvdpau @@ -57,7 +55,7 @@ Summary: A personal video recorder (PVR) application Summary(pl.UTF-8): Osobista aplikacja do nagrywania obrazu (PVR) Name: mythtv Version: 0.26.0 -Release: 2 +Release: 3 License: GPL v2 Group: Applications/Multimedia Source0: ftp://ftp.osuosl.org/pub/mythtv/%{name}-%{version}.tar.bz2 @@ -115,6 +113,9 @@ BuildRequires: perl-Net-UPnP-QueryResponse BuildRequires: perl-Net-UPnP-ControlPoint BuildRequires: perl-IO-Socket-INET6 %endif +%if %{with python} +BuildRequires: python-MySQLdb +%endif BuildRequires: pkgconfig %{?with_pulseaudio:BuildRequires: pulseaudio-devel} BuildRequires: python-devel gitweb: http://git.pld-linux.org/gitweb.cgi/packages/mythtv.git/commitdiff/2529ba62dc5304d2c4d2bc03aae02be1921f917f ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-cryptsetup] - pl, optflags
commit 43f8d1e107e563be4f7341e609588df3c39c1a2f Author: Jakub Bogusz qbo...@pld-linux.org Date: Fri May 17 22:54:02 2013 +0200 - pl, optflags python-cryptsetup.spec | 5 + 1 file changed, 5 insertions(+) --- diff --git a/python-cryptsetup.spec b/python-cryptsetup.spec index 3513d16..a6c5f1f 100644 --- a/python-cryptsetup.spec +++ b/python-cryptsetup.spec @@ -1,5 +1,6 @@ %definemodule cryptsetup Summary: Python bindings for cryptsetup +Summary(pl.UTF-8): Wiązania Pythona do biblioteki cryptsetup Name: python-%{module} Version: 0.1.4 Release: 1 @@ -23,10 +24,14 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description A Python module to ease the manipulation with LUKS devices. +%description -l pl.UTF-8 +Moduł Pythona ułatwiający operacje na urządzeniach LUKS + %prep %setup -q %build +CFLAGS=%{rpmcflags} \ %{__python} setup.py build %install gitweb: http://git.pld-linux.org/gitweb.cgi/packages/python-cryptsetup.git/commitdiff/43f8d1e107e563be4f7341e609588df3c39c1a2f ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit