[packages/python-cachetools] Initial version 0.6.0.
commit 19ecff7c258acded4dff214c89f59d3e4a95740f Author: Mateusz Korniak mat...@pld-linux.org Date: Fri Oct 31 12:35:45 2014 +0100 Initial version 0.6.0. python-cachetools.spec | 132 + 1 file changed, 132 insertions(+) --- diff --git a/python-cachetools.spec b/python-cachetools.spec new file mode 100644 index 000..4136ebb --- /dev/null +++ b/python-cachetools.spec @@ -0,0 +1,132 @@ +# +# Conditional build: +%bcond_withdoc # don't build doc (not provided by package) +%bcond_without tests # do not perform make test +%bcond_without python2 # CPython 2.x module +%bcond_without python3 # CPython 3.x module + +%definemodule cachetools +Summary: Various cache implementations based on different cache algorithms +Summary(pl.UTF-8): Rózne implementacje cache bazujące na róznych algorytmach +# Name must match the python module/package name (as in 'import' statement) +Name: python-%{module} +Version: 0.6.0 +Release: 1 +License: MIT +Group: Libraries/Python + +Source0: https://pypi.python.org/packages/source/c/%{module}/%{module}-%{version}.tar.gz +# Source0-md5: 45522c095523ab09af859c9fd54643c2 +URL: https://github.com/tkem/cachetools +BuildRequires: rpm-pythonprov +# if py_postclean is used +BuildRequires: rpmbuild(macros) = 1.219 +%if %{with python2} +BuildRequires: python-distribute +%endif +%if %{with python3} +BuildRequires: python3-distribute +BuildRequires: python3-modules +%endif +Requires: python-modules +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +This module provides various cache implementations based on different cache algorithms, +as well as decorators for easily memoizing function and method calls. + +%description -l pl.UTF-8 +Moduł dostarcza rózne implementacje cache'u bazujące na róznych algorytmach, jak również +dektoratory do łatwego zapamiętywania wyników funcji i metod. + +%package -n python3-%{module} +Summary: Various cache implementations based on different cache algorithms +Summary(pl.UTF-8): Rózne implementacje cache bazujące na róznych algorytmach +Group: Libraries/Python +Requires: python3-modules + +%description -n python3-%{module} +This module provides various cache implementations based on different cache algorithms, +as well as decorators for easily memoizing function and method calls. + +%description -n python3-%{module} -l pl.UTF-8 +Moduł dostarcza rózne implementacje cache'u bazujące na róznych algorytmach, jak również +dektoratory do łatwego zapamiętywania wyników funcji i metod. + +%package apidocs +Summary: %{module} API documentation +Summary(pl.UTF-8): Dokumentacja API %{module} +Group: Documentation + +%description apidocs +API documentation for %{module}. + +%description apidocs -l pl.UTF-8 +Dokumentacja API %{module}. + +%prep +%setup -q -n %{module}-%{version} + +%build +%if %{with python2} +%{__python} setup.py build --build-base build-2 %{?with_tests:test} +%endif + +%if %{with python3} +%{__python3} setup.py build --build-base build-3 %{?with_tests:test} +%endif + +%if %{with doc} +cd docs +%{__make} -j1 html +rm -rf _build/html/_sources +%endif + +%install +rm -rf $RPM_BUILD_ROOT + +%if %{with python2} +%{__python} setup.py \ + build --build-base build-2 \ + install --skip-build \ + --optimize=2 \ + --root=$RPM_BUILD_ROOT + +%py_postclean +%endif + +%if %{with python3} +%{__python3} setup.py \ + build --build-base build-3 \ + install --skip-build \ + --optimize=2 \ + --root=$RPM_BUILD_ROOT +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + +%if %{with python2} +%files +%defattr(644,root,root,755) +%doc Changes LICENSE README.rst +%{py_sitescriptdir}/%{module} +%if %{py_ver} 2.4 +%{py_sitescriptdir}/%{module}-%{version}-py*.egg-info +%endif +%endif + +%if %{with python3} +%files -n python3-%{module} +%defattr(644,root,root,755) +%doc Changes LICENSE README.rst +%{py3_sitescriptdir}/%{module} +%{py3_sitescriptdir}/%{module}-%{version}-py*.egg-info +%endif + +%if %{with doc} +%files apidocs +%defattr(644,root,root,755) +%doc docs/_build/html/* +%endif gitweb: http://git.pld-linux.org/gitweb.cgi/packages/python-cachetools.git/commitdiff/19ecff7c258acded4dff214c89f59d3e4a95740f ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-cachetools] Created branch master
The branch 'master' was created. Summary of new commits: 19ecff7... Initial version 0.6.0. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: python-cachetools: cachetools-0.6.0.tar.gz
Request by: matkor Files fetched: 1 STORED: https://pypi.python.org/packages/source/c/cachetools/cachetools-0.6.0.tar.gz 45522c095523ab09af859c9fd54643c2 cachetools-0.6.0.tar.gz Size: 8863 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/alpine] - 2.11 - not tested, yet. Builds
commit 315a68745eb732b496c9c083ae29c5544670d03a Author: Paweł Gołaszewski bl...@pld-linux.org Date: Fri Oct 31 15:08:24 2014 +0100 - 2.11 - not tested, yet. Builds alpine.spec | 18 +- format-security.patch | 33 -- re-alpine-2.01.smime-signandencrypt.patch | 39 --- 3 files changed, 6 insertions(+), 84 deletions(-) --- diff --git a/alpine.spec b/alpine.spec index b4fb4a3..b1bdc18 100644 --- a/alpine.spec +++ b/alpine.spec @@ -3,22 +3,19 @@ # - separate package with tcl web-frontend # - fix as-needed # - pico shouldn't link with kerberos, should it? -# - switch to http://re-alpine.sourceforge.net/ - RIP alpine -%definever 2.00 -%definepatchlevel 84 Summary: University of Washington Alpine mail user agent Summary(pl.UTF-8): Klient pocztowy Alpine z Uniwersytetu w Waszyngtonie Name: alpine -Version: %{ver}.%{patchlevel} -Release: 10 +Version: 2.11 +Release: 0.1 Epoch: 1 License: Apache v2.0 Group: Applications/Mail # Main site: #Source0: ftp://ftp.cac.washington.edu/alpine/%{name}-%{version}.tar.gz -# Source with applied patches from http://staff.washington.edu/chappa/alpine/ -Source0: http://staff.washington.edu/chappa/alpine/patches/alpine-%{ver}/%{name}-%{ver}_%{patchlevel}.tar.gz -# Source0-md5: 70ba4281354f1ba2d341038ec0e323c7 +# Current source is from: http://patches.freeiz.com/alpine/ +Source0: http://patches.freeiz.com/alpine/patches/%{name}-%{version}/%{name}-%{version}.tar.xz +# Source0-md5: d2d9ca3716b9a23e5fa41ddf5ad06b6b Source1: pico.desktop Source2: %{name}.desktop Source3: %{name}.png @@ -32,7 +29,6 @@ Patch6: %{name}-no_1777_warning.patch Patch7:%{name}-home_etc.patch Patch8:%{name}-RFC1522_MAXW.patch Patch9:mimedesc.patch -Patch10: re-alpine-2.01.smime-signandencrypt.patch Patch11: format-security.patch URL: http://www.washington.edu/alpine/ BuildRequires: autoconf @@ -125,7 +121,7 @@ como no Pine, comandos são apresentados na parte de baixo da tela, e ajuda de acordo com o contexto está disponível. %prep -%setup -q -n %{name}-%{ver} +%setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -136,8 +132,6 @@ ajuda de acordo com o contexto está disponível. %patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 -%patch11 -p1 %build rm -f libtool missing diff --git a/format-security.patch b/format-security.patch deleted file mode 100644 index d4f73d4..000 --- a/format-security.patch +++ /dev/null @@ -1,33 +0,0 @@ alpine-2.00/pith/ldap.c~ 2008-04-08 00:58:40.0 +0200 -+++ alpine-2.00/pith/ldap.c2012-12-07 08:16:50.304560842 +0100 -@@ -778,7 +778,7 @@ -*/ - switch(args){ - case 0: -- snprintf(filter, sizeof(filter), filt_format); -+ snprintf(filter, sizeof(filter), %s, filt_format); - break; - case 1: - snprintf(filter, sizeof(filter), filt_format, scp); alpine-2.00/imap/src/osdep/unix/flocklnx.c~2008-06-04 20:18:34.0 +0200 -+++ alpine-2.00/imap/src/osdep/unix/flocklnx.c 2012-12-07 08:13:57.761233591 +0100 -@@ -57,7 +57,7 @@ - case ENOLCK: /* lock table is full */ - sprintf (tmp,File locking failure: %s,strerror (errno)); - mm_log (tmp,WARN); /* give the user a warning of what happened */ -- if (!logged++) syslog (LOG_ERR,tmp); -+ if (!logged++) syslog (LOG_ERR,File locking failure: %s,strerror (errno)); - /* return failure if non-blocking lock */ - if (op LOCK_NB) return -1; - sleep (5); /* slow down in case it loops */ alpine-2.00/alpine/mailcmd.c~ 2011-02-08 05:34:16.0 +0100 -+++ alpine-2.00/alpine/mailcmd.c 2012-12-07 08:18:38.574557022 +0100 -@@ -7963,7 +7963,7 @@ - - case 13 : /* Match my addresses */ - me++; -- snprintf(sstring, sizeof(sstring), not ? _(dont_match_me) : _(match_me)); -+ snprintf(sstring, sizeof(sstring), %s, not ? _(dont_match_me) : _(match_me)); - continue; - - case 14 : /* Subject: default */ diff --git a/re-alpine-2.01.smime-signandencrypt.patch b/re-alpine-2.01.smime-signandencrypt.patch deleted file mode 100644 index 7e76b93..000 --- a/re-alpine-2.01.smime-signandencrypt.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -rup re-alpine-2.01.orig/pith/smime.c re-alpine-2.01.smime-patch/pith/smime.c re-alpine-2.01.orig/pith/smime.c 2009-08-03 04:02:24.0 -0400 -+++ re-alpine-2.01.smime-patch/pith/smime.c2011-03-06 22:41:08.894139317 -0500 -@@ -1736,7 +1736,6 @@ do_decoding(BODY *b, long msgno, const c - PERSONAL_CERT *pcert =
DISTFILES: alpine: alpine-2.11.tar.xz
Request by: blues Files fetched: 1 STORED: http://patches.freeiz.com/alpine/patches/alpine-2.11/alpine-2.11.tar.xz d2d9ca3716b9a23e5fa41ddf5ad06b6b alpine-2.11.tar.xz Size: 4574092 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/xulrunner] - updated to 33.0.2 - sync with iceweasel.spec
commit 4d4b2f8d1131a27f573e73d0648842ccaa9eaac5 Author: Jakub Bogusz qbo...@pld-linux.org Date: Fri Oct 31 15:11:13 2014 +0100 - updated to 33.0.2 - sync with iceweasel.spec xulrunner.spec | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) --- diff --git a/xulrunner.spec b/xulrunner.spec index bf0113f..6d17eb1 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -14,13 +14,13 @@ # The actual sqlite version (see RHBZ#480989): %definesqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2/dev/null || echo ERROR) -%definenspr_ver4.10.6 -%definenss_ver 3.17.1 +%definenspr_ver4.10.6 +%definenss_ver 3.17.1 Summary: XULRunner - Mozilla Runtime Environment for XUL+XPCOM applications Summary(pl.UTF-8): XULRunner - środowisko uruchomieniowe Mozilli dla aplikacji XUL+XPCOM Name: xulrunner -Version: 33.0.1 +Version: 33.0.2 Release: 1 Epoch: 2 License: MPL v2.0 @@ -28,7 +28,7 @@ Group:X11/Applications # Source tarball for xulrunner is in fact firefox tarball (checked on 1.9), so lets use it # instead of waiting for mozilla to copy file on ftp. Source0: http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2 -# Source0-md5: 5a1c4b0b2349e3db94b45bd3f03f9288 +# Source0-md5: 385ad037451f141b68515c73cad01704 Patch0:%{name}-new-libxul.patch Patch1:%{name}-rpath.patch Patch2:%{name}-paths.patch @@ -69,11 +69,13 @@ BuildRequires: pango-devel = 1:1.22.0 BuildRequires: pixman-devel = 0.19.2 BuildRequires: pkgconfig BuildRequires: pkgconfig(libffi) = 3.0.9 -BuildRequires: python = 1:2.5 +BuildRequires: pulseaudio-devel +BuildRequires: python-modules = 1:2.5 BuildRequires: python-simplejson BuildRequires: python-virtualenv = 1.9.1-4 +BuildRequires: readline-devel BuildRequires: rpm = 4.4.9-56 -BuildRequires: rpmbuild(macros) = 1.657 +BuildRequires: rpmbuild(macros) = 1.601 BuildRequires: sed = 4.0 BuildRequires: sqlite3-devel = 3.8.5 BuildRequires: startup-notification-devel = 0.8 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xulrunner.git/commitdiff/4d4b2f8d1131a27f573e73d0648842ccaa9eaac5 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/alpine] - BR: autoconf = 2.69
commit e4855723aabca80484a418fcf45a39a49c0d4f33 Author: Paweł Gołaszewski bl...@pld-linux.org Date: Fri Oct 31 15:14:01 2014 +0100 - BR: autoconf = 2.69 alpine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/alpine.spec b/alpine.spec index 4eb8528..9b9808f 100644 --- a/alpine.spec +++ b/alpine.spec @@ -30,7 +30,7 @@ Patch7: %{name}-home_etc.patch Patch8:%{name}-RFC1522_MAXW.patch Patch9:mimedesc.patch URL: http://www.washington.edu/alpine/ -BuildRequires: autoconf +BuildRequires: autoconf = 2.69 BuildRequires: automake BuildRequires: home-etc-devel %if %{pld_release} != ac gitweb: http://git.pld-linux.org/gitweb.cgi/packages/alpine.git/commitdiff/473649e1ea1b77b6ebd99656adbd68d20fb9d9b3 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/alpine] - patch removed from repo - remove it from spec
commit ecb8663df3a98e83bfcb4f74c26ed12325b9e765 Author: Paweł Gołaszewski bl...@pld-linux.org Date: Fri Oct 31 15:12:39 2014 +0100 - patch removed from repo - remove it from spec alpine.spec | 1 - 1 file changed, 1 deletion(-) --- diff --git a/alpine.spec b/alpine.spec index b1bdc18..4eb8528 100644 --- a/alpine.spec +++ b/alpine.spec @@ -29,7 +29,6 @@ Patch6: %{name}-no_1777_warning.patch Patch7:%{name}-home_etc.patch Patch8:%{name}-RFC1522_MAXW.patch Patch9:mimedesc.patch -Patch11: format-security.patch URL: http://www.washington.edu/alpine/ BuildRequires: autoconf BuildRequires: automake gitweb: http://git.pld-linux.org/gitweb.cgi/packages/alpine.git/commitdiff/473649e1ea1b77b6ebd99656adbd68d20fb9d9b3 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/alpine] - BR: openssl-devel = 1.0.1c
commit 473649e1ea1b77b6ebd99656adbd68d20fb9d9b3 Author: Paweł Gołaszewski bl...@pld-linux.org Date: Fri Oct 31 15:15:40 2014 +0100 - BR: openssl-devel = 1.0.1c alpine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/alpine.spec b/alpine.spec index 9b9808f..a23c30a 100644 --- a/alpine.spec +++ b/alpine.spec @@ -39,7 +39,7 @@ BuildRequires:heimdal-devel BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: openldap-devel -BuildRequires: openssl-devel +BuildRequires: openssl-devel = 1.0.1c BuildRequires: pam-devel # Only for web-frontend: #BuildRequires:tcl-devel gitweb: http://git.pld-linux.org/gitweb.cgi/packages/alpine.git/commitdiff/473649e1ea1b77b6ebd99656adbd68d20fb9d9b3 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/mozilla-firefox] - saving update to 33.0.1
commit 08ccc3c53a37c91a941fab9aad6c8d29fc076f07 Author: Jakub Bogusz qbo...@pld-linux.org Date: Fri Oct 31 15:21:09 2014 +0100 - saving update to 33.0.1 mozilla-firefox-middle_click_paste.patch | 6 +- mozilla-firefox-packaging.patch | 201 +-- mozilla-firefox.spec | 50 3 files changed, 86 insertions(+), 171 deletions(-) --- diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec index 6df3efb..fd75346 100644 --- a/mozilla-firefox.spec +++ b/mozilla-firefox.spec @@ -9,25 +9,27 @@ %bcond_withtests # enable tests (whatever they check) %bcond_withgtk3# GTK+ 3.x instead of 2.x %bcond_without kerberos# disable krb5 support -%bcond_without xulrunner # system xulrunner +%bcond_withxulrunner # system xulrunner [no longer supported] +# - disabled shared_js - https://bugzilla.mozilla.org/show_bug.cgi?id=1039964 +%bcond_withshared_js %if %{without xulrunner} # The actual sqlite version (see RHBZ#480989): %definesqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2/dev/null || echo ERROR) %endif -%definenspr_ver4.10.3 -%definenss_ver 3.16 +%definenspr_ver4.10.6 +%definenss_ver 3.17.1 Summary: Firefox Community Edition web browser Summary(pl.UTF-8): Firefox Community Edition - przeglądarka WWW Name: mozilla-firefox -Version: 29.0.1 +Version: 33.0.1 Release: 1 License: MPL v2.0 Group: X11/Applications/Networking Source0: http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2 -# Source0-md5: ca37addc3a69ef30247e00375dd93cd0 +# Source0-md5: 5a1c4b0b2349e3db94b45bd3f03f9288 Source3: %{name}.desktop Source4: %{name}.sh Source5: vendor.js @@ -48,6 +50,8 @@ BuildRequires:cairo-devel = 1.10.2-5 BuildRequires: dbus-glib-devel = 0.60 BuildRequires: gcc-c++ = 6:4.4 BuildRequires: glib2-devel = 1:2.20 +BuildRequires: gstreamer-devel = 1.0 +BuildRequires: gstreamer-plugins-base-devel = 1.0 %{!?with_gtk3:BuildRequires: gtk+2-devel = 2:2.14} %{?with_gtk3:BuildRequires:gtk+3-devel = 3.0.0} %{?with_kerberos:BuildRequires:heimdal-devel = 0.7.1} @@ -62,21 +66,23 @@ BuildRequires: libicu-devel = 50.1 BuildRequires: libjpeg-devel = 6b BuildRequires: libjpeg-turbo-devel BuildRequires: libpng(APNG)-devel = 0.10 -BuildRequires: libpng-devel = 2:1.6.7 +BuildRequires: libpng-devel = 2:1.6.10 BuildRequires: libstdc++-devel = 6:4.4 BuildRequires: libvpx-devel = 1.3.0 BuildRequires: nspr-devel = 1:%{nspr_ver} BuildRequires: nss-devel = 1:%{nss_ver} -BuildRequires: pango-devel = 1:1.14.0 +BuildRequires: pango-devel = 1:1.22.0 BuildRequires: pixman-devel = 0.19.2 BuildRequires: perl-modules = 5.004 BuildRequires: pkgconfig BuildRequires: pkgconfig(libffi) = 3.0.9 +BuildRequires: pulseaudio-devel BuildRequires: python-modules BuildRequires: python-virtualenv +BuildRequires: readline-devel BuildRequires: rpm = 4.4.9-56 BuildRequires: rpmbuild(macros) = 1.601 -BuildRequires: sqlite3-devel = 3.8.2 +BuildRequires: sqlite3-devel = 3.8.5 BuildRequires: startup-notification-devel = 0.8 BuildRequires: xorg-lib-libXScrnSaver-devel BuildRequires: xorg-lib-libXext-devel @@ -100,13 +106,13 @@ Requires: glib2 = 1:2.20 %{!?with_gtk3:Requires:gtk+2 = 2:2.14} %{?with_gtk3:Requires: gtk+3 = 3.0.0} Requires: libjpeg-turbo -Requires: libpng = 2:1.6.7 +Requires: libpng = 2:1.6.10 Requires: libpng(APNG) = 0.10 Requires: libvpx = 1.3.0 Requires: myspell-common Requires: nspr = 1:%{nspr_ver} Requires: nss = 1:%{nss_ver} -Requires: pango = 1:1.14.0 +Requires: pango = 1:1.22.0 Requires: sqlite3 = %{sqlite_build_version} Requires: startup-notification = 0.8 %endif @@ -150,17 +156,12 @@ cd mozilla %build cd mozilla -cp -f %{_datadir}/automake/config.* build/autoconf +cp -pf %{_datadir}/automake/config.* build/autoconf -cat EOF .mozconfig -. \$topsrcdir/browser/config/mozconfig +cat 'EOF' .mozconfig +. $topsrcdir/browser/config/mozconfig mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-%{_target_cpu} -# parallel build fails on _xpidlgen/ -%if %{without xulrunner} -mk_add_options MOZ_MAKE_FLAGS=%{_smp_mflags} -%endif -mk_add_options PROFILE_GEN_SCRIPT='@PYTHON@ @MOZ_OBJDIR@/_profile/pgo/profileserver.py' # Options for 'configure' (same as command-line options). ac_add_options --build=%{_target_platform} @@ -216,14 +217,15 @@ ac_add_options --disable-xterm-updates ac_add_options --enable-canvas ac_add_options --enable-chrome-format=omni ac_add_options --enable-default-toolkit=%{?with_gtk3:cairo-gtk3}%{!?with_gtk3:cairo-gtk2} -ac_add_options --enable-extensions=default,gio +ac_add_options --enable-extensions=default
[packages/alpine] - rel.1 - not for AC :(
commit 9f5aa023237cdf793a0d23ad8374756b0929108f Author: Paweł Gołaszewski bl...@pld-linux.org Date: Fri Oct 31 15:18:58 2014 +0100 - rel.1 - not for AC :( alpine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/alpine.spec b/alpine.spec index a23c30a..70a4ead 100644 --- a/alpine.spec +++ b/alpine.spec @@ -7,7 +7,7 @@ Summary:University of Washington Alpine mail user agent Summary(pl.UTF-8): Klient pocztowy Alpine z Uniwersytetu w Waszyngtonie Name: alpine Version: 2.11 -Release: 0.1 +Release: 1 Epoch: 1 License: Apache v2.0 Group: Applications/Mail gitweb: http://git.pld-linux.org/gitweb.cgi/packages/alpine.git/commitdiff/9f5aa023237cdf793a0d23ad8374756b0929108f ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ParaView] Created branch DEVEL
The branch 'DEVEL' was created pointing to: 5efd692... - started update to 4.2.0 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ParaView] Revert - started update to 4.2.0
commit 1134f69ea65067dc110359367d5cbea9b0e4d3d2 Author: Jan Rękorajski bagg...@pld-linux.org Date: Fri Oct 31 16:40:50 2014 +0100 Revert - started update to 4.2.0 This reverts commit 5efd6928d75a41120a0f0bf2fb031a3714157a36. It seems impossible to build v4.2.0 without network and our infrastructure do not support that. ParaView.spec | 19 ++- 1 file changed, 10 insertions(+), 9 deletions(-) --- diff --git a/ParaView.spec b/ParaView.spec index fa1ee50..1347c48 100644 --- a/ParaView.spec +++ b/ParaView.spec @@ -1,12 +1,12 @@ Summary: Parallel visualization application Name: ParaView -Version: 4.2.0 -Release: 0.1 +Version: 4.0.1 +Release: 9 License: BSD Group: Applications/Engineering URL: http://www.paraview.org/ -Source0: http://www.paraview.org/files/v4.2/%{name}-v%{version}-source.tar.gz -# Source0-md5: 77cf0e3804eb7bb91d2d94b10bd470f4 +Source0: http://www.paraview.org/files/v4.0/%{name}-v%{version}-source.tgz +# Source0-md5: 6a300744eaf32676a3a7e1b42eb642c7 Source1: %{name}_22x22.png Source2: %{name}.xml Patch0:%{name}-vtk-use-system-libs.patch @@ -87,10 +87,10 @@ developing applications that use %{name}. %prep %setup -q -n %{name}-v%{version}-source %patch0 -p0 -#%patch1 -p1 -#%patch2 -p1 -#%patch3 -p0 -#%patch4 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p0 +%patch4 -p1 %patch5 -p1 #Remove included thirdparty sources just to be sure for x in protobuf ; do @@ -100,6 +100,8 @@ for x in expat freetype gl2ps hdf5 jpeg libxml2 netcdf oggtheora png sqlite tiff rm -r VTK/ThirdParty/$x/vtk$x done +%{__rm} -r ParaViewCore/ServerImplementation/Default/Testing + %build rm -rf build mkdir build @@ -140,7 +142,6 @@ cd build -DVTK_USE_SYSTEM_PNG:BOOL=ON \ -DVTK_USE_SYSTEM_TIFF:BOOL=ON \ -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \ - -DVTK_USE_SYSTEM_PROTOBUF:BOOL=ON \ -DVTK_CUSTOM_LIBRARY_SUFFIX= \ -DVTK_USE_INFOVIS:BOOL=OFF \ -DVTK_USE_SYSTEM_ICET=OFF \ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ParaView.git/commitdiff/1134f69ea65067dc110359367d5cbea9b0e4d3d2 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/alpine] tar.xz deps
commit 49949e300cf4f0548fd9030e6f7fa8be8280 Author: Elan Ruusamäe g...@delfi.ee Date: Fri Oct 31 17:51:13 2014 +0200 tar.xz deps alpine.spec | 22 -- 1 file changed, 12 insertions(+), 10 deletions(-) --- diff --git a/alpine.spec b/alpine.spec index 70a4ead..eaa33ad 100644 --- a/alpine.spec +++ b/alpine.spec @@ -33,21 +33,23 @@ URL:http://www.washington.edu/alpine/ BuildRequires: autoconf = 2.69 BuildRequires: automake BuildRequires: home-etc-devel -%if %{pld_release} != ac -BuildRequires: heimdal-devel -%endif BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: openldap-devel BuildRequires: openssl-devel = 1.0.1c BuildRequires: pam-devel +BuildRequires: tar = 1:1.22 +BuildRequires: xz # Only for web-frontend: #BuildRequires:tcl-devel +%if %{pld_release} != ac +BuildRequires: heimdal-devel +%endif Suggests: aspell Suggests: ca-certificates -Conflicts: ca-certificates 20080809-4 Provides: pine = 6.00 Obsoletes: pine +Conflicts: ca-certificates 20080809-4 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %definealpineconfdir %{_sysconfdir}/%{name} @@ -93,9 +95,9 @@ dostępna jest pomoc kontekstowa. Wpisywane znaki są natychmiast włączane do tekstu. %description -n pico -l pt_BR.UTF-8 -Pico é um editor de texto baseado no compositor de mensagens do Alpine. -Assim como no Pine, comandos são mostrados na parte de baixo da tela, -e ajuda de acordo com o contexto está disponível. +Pico é um editor de texto baseado no compositor de mensagens do +Alpine. Assim como no Pine, comandos são mostrados na parte de baixo +da tela, e ajuda de acordo com o contexto está disponível. %package -n pilot Summary: Simple file system browser in the style of the Alpine Composer @@ -171,9 +173,9 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_desktopdir},%{_pixmapsdir}} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} -install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir} -install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir} +cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} +cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir} +cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir} ln -s alpine $RPM_BUILD_ROOT%{_bindir}/pine gitweb: http://git.pld-linux.org/gitweb.cgi/packages/alpine.git/commitdiff/49949e300cf4f0548fd9030e6f7fa8be8280 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/qt5-qtwebkit-examples] - up to 5.3.2
commit fdeea969c87c8ec7ce222fd4497778010731513b Author: Jakub Bogusz qbo...@pld-linux.org Date: Fri Oct 31 18:18:21 2014 +0100 - up to 5.3.2 qt5-qtwebkit-examples.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/qt5-qtwebkit-examples.spec b/qt5-qtwebkit-examples.spec index ef3b479..26d6bf8 100644 --- a/qt5-qtwebkit-examples.spec +++ b/qt5-qtwebkit-examples.spec @@ -12,12 +12,12 @@ Summary: Qt5 WebKit examples Summary(pl.UTF-8): Przykłady do bibliotek Qt5 WebKit Name: qt5-%{orgname} -Version: 5.3.1 +Version: 5.3.2 Release: 1 License: LGPL v2+ Group: X11/Libraries Source0: http://download.qt-project.org/official_releases/qt/5.3/%{version}/submodules/%{orgname}-opensource-src-%{version}.tar.xz -# Source0-md5: 5827c61adba1d6921c51ef7ba1adce68 +# Source0-md5: 6f88c2a99002801a1943483331f8b4f0 URL: http://qt-project.org/ BuildRequires: OpenGL-devel BuildRequires: Qt5Concurrent-devel = %{qtbase_ver} gitweb: http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtwebkit-examples.git/commitdiff/fdeea969c87c8ec7ce222fd4497778010731513b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: qt5-qtwebkit-examples: qtwebkit-examples-opensource-src-5.3.2.tar.xz
Request by: qboosh Files fetched: 1 STORED: http://download.qt-project.org/official_releases/qt/5.3/5.3.2/submodules/qtwebkit-examples-opensource-src-5.3.2.tar.xz 6f88c2a99002801a1943483331f8b4f0 qtwebkit-examples-opensource-src-5.3.2.tar.xz Size: 3409140 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/qt5-qtenginio] - updated to 5.3.2
commit c2dc9bc5802193c09c5d5a56899a57646c60aa6a Author: Jakub Bogusz qbo...@pld-linux.org Date: Fri Oct 31 19:06:40 2014 +0100 - updated to 5.3.2 qt5-qtenginio.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/qt5-qtenginio.spec b/qt5-qtenginio.spec index faac537..f4f348d 100644 --- a/qt5-qtenginio.spec +++ b/qt5-qtenginio.spec @@ -9,12 +9,12 @@ Summary: The Qt5 Enginio library Summary(pl.UTF-8): Biblioteka Qt5 Enginio Name: qt5-%{orgname} -Version: 5.3.1 +Version: 5.3.2 Release: 1 License: LGPL v2.1 with Digia Qt LGPL Exception v1.1 or GPL v3.0 Group: Libraries Source0: http://download.qt-project.org/official_releases/qt/5.3/%{version}/submodules/%{orgname}-opensource-src-%{version}.tar.xz -# Source0-md5: 89bffcd329886fd1fe4e504c666987cd +# Source0-md5: 53b67cf5470dfa9bcfc59aa5b8bfd66d URL: http://qt-project.org/ BuildRequires: Qt5Core-devel = %{qtbase_ver} BuildRequires: Qt5Gui-devel = %{qtbase_ver} gitweb: http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtenginio.git/commitdiff/c2dc9bc5802193c09c5d5a56899a57646c60aa6a ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: qt5-qtenginio: qtenginio-opensource-src-5.3.2.tar.xz
Request by: qboosh Files fetched: 1 STORED: http://download.qt-project.org/official_releases/qt/5.3/5.3.2/submodules/qtenginio-opensource-src-5.3.2.tar.xz 53b67cf5470dfa9bcfc59aa5b8bfd66d qtenginio-opensource-src-5.3.2.tar.xz Size: 517552 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/ParaView] - use private protobuf library (bcond added) - rel 10
commit ca511d1a5acc2c482993770bc6a79e6fda1c2493 Author: Jan Rękorajski bagg...@pld-linux.org Date: Fri Oct 31 19:59:38 2014 +0100 - use private protobuf library (bcond added) - rel 10 ParaView.spec | 15 --- 1 file changed, 12 insertions(+), 3 deletions(-) --- diff --git a/ParaView.spec b/ParaView.spec index 1347c48..47f1155 100644 --- a/ParaView.spec +++ b/ParaView.spec @@ -1,7 +1,11 @@ +# +# Conditional build: +%bcond_withsystem_protobuf # build with system protobuf library +# Summary: Parallel visualization application Name: ParaView Version: 4.0.1 -Release: 9 +Release: 10 License: BSD Group: Applications/Engineering URL: http://www.paraview.org/ @@ -40,7 +44,7 @@ BuildRequires:libtiff-devel BuildRequires: netcdf-devel BuildRequires: netcdf-cxx-devel BuildRequires: openssl-devel -BuildRequires: protobuf-devel +%{?with_system_protobuf:BuildRequires: protobuf-devel} BuildRequires: python-devel BuildRequires: qt4-build BuildRequires: readline-devel @@ -88,14 +92,18 @@ developing applications that use %{name}. %setup -q -n %{name}-v%{version}-source %patch0 -p0 %patch1 -p1 -%patch2 -p1 %patch3 -p0 %patch4 -p1 + +%if %{with system_protobuf} +%patch2 -p1 %patch5 -p1 #Remove included thirdparty sources just to be sure for x in protobuf ; do rm -r ThirdParty/$x/vtk$x done +%endif + for x in expat freetype gl2ps hdf5 jpeg libxml2 netcdf oggtheora png sqlite tiff zlib ; do rm -r VTK/ThirdParty/$x/vtk$x done @@ -140,6 +148,7 @@ cd build -DVTK_USE_SYSTEM_LIBRARIES:BOOL=ON \ -DVTK_USE_SYSTEM_LIBRARIES=ON \ -DVTK_USE_SYSTEM_PNG:BOOL=ON \ + -DVTK_USE_SYSTEM_PROTOBUF:BOOL=%{?with_system_protobuf:ON}%{!?with_system_protobuf:OFF} \ -DVTK_USE_SYSTEM_TIFF:BOOL=ON \ -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \ -DVTK_CUSTOM_LIBRARY_SUFFIX= \ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ParaView.git/commitdiff/ca511d1a5acc2c482993770bc6a79e6fda1c2493 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/libpsl] - pl
commit 032b7ee925b71b6eda8f91d74fc35def4f604334 Author: Jakub Bogusz qbo...@pld-linux.org Date: Fri Oct 31 20:00:07 2014 +0100 - pl libpsl.spec | 45 + 1 file changed, 41 insertions(+), 4 deletions(-) --- diff --git a/libpsl.spec b/libpsl.spec index 97fada7..5021cca 100644 --- a/libpsl.spec +++ b/libpsl.spec @@ -1,4 +1,5 @@ Summary: C library for the Publix Suffix List +Summary(pl.UTF-8): Biblioteka C do obsługi listy przyrostków publicznych (Public Suffix List) Name: libpsl Version: 0.5.1 Release: 2 @@ -39,16 +40,45 @@ Libpsl... - is thread-safe; - handles IDNA2008 UTS#46; +%description -l pl.UTF-8 +libpsl to biblioteka C do obsługi listy przyrostków publicznych +(Public Suffix List). Przyrostek publiczny to nazwa domeny, poniżej +której bezpośrednio użytkownicy Internetu mogą rejestrować własne +nazwy. + +Przeglądarki i inni klienci WWW mogą jej używać w celu: +- zapobieganiu superciasteczek naruszającym prywatność +- zapobieganiu certyfikatom superdomenowym naruszającym prywatność +- podświetlania części domen w interfejsie użytkownika +- sortowania listy domen według serwisu. + +Libpsl: +- ma wbudowane dane PSL dla szybkiego dostępu +- pozwala na wczytywanie danych PSL z plików +- sprawdza, czy dana domena jest przyrostkiem publicznym +- zapewnia natychmiastową weryfikację domeny ciasteczka +- znajduje najdłuższą publiczną część podanej domeny +- znajduje najkrótszą prywatną część podanej domeny +- działa z domenami międzynarodowymi (UTF-8 i IDNA2008 Punycode) +- jest bezpieczna względem wątków +- obsługuje IDNA2008 UTS#46. + %package devel -Summary: Development files for %{name} +Summary: Development files for libpsl +Summary(pl.UTF-8): Pliki programistyczne biblioteki libpsl Requires: %{name} = %{version}-%{release} %description devel -This package contains libraries and header files for developing -applications that use %{name}. +This package contains the header file for developing applications that +use libpsl. + +%description devel -l pl.UTF-8 +Ten pakiet zawiera plik nagłówkowy do tworzenia aplikacji +wykorzystujących bibliotekę libpsl. %package utils Summary: Commandline utility to explore the Public Suffix List +Summary(pl.UTF-8): Narzędzie linii poleceń do eksplorowania listy przyrostków publicznych Requires: %{name} = %{version}-%{release} %description utils @@ -56,6 +86,12 @@ This package contains a commandline utility to explore the Public Suffix List, for example it checks if domains are public suffixes, checks if cookie-domain is acceptable for domains and so on. +%description utils -l pl.UTF-8 +Ten pakiet zawiera narzędzie linii poleceń do eksplorowania listy +przyrostków publicznych (Public Suffix List); sprawdza ono na +przykład, czy domeny są przyrostkami publicznymi, czy domena +ciasteczka jest akceptowalna dla domen itp. + %prep %setup -q @@ -77,6 +113,8 @@ rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +%{__rm} $RPM_BUILD_ROOT%{_datadir}/libpsl/test_psl.txt + %clean rm -rf $RPM_BUILD_ROOT @@ -97,7 +135,6 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/libpsl.3* #%{_datadir}/gtk-doc/html/libpsl/ %{_datadir}/%{name} -%exclude %{_datadir}/libpsl/test_psl.txt %files utils %defattr(644,root,root,755) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/libpsl.git/commitdiff/032b7ee925b71b6eda8f91d74fc35def4f604334 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/libpsl] - updated to 0.6.0, finished packaging
commit 421caf12418a56fd5c02e6aa00f00a37d4af1a10 Author: Jakub Bogusz qbo...@pld-linux.org Date: Fri Oct 31 21:04:30 2014 +0100 - updated to 0.6.0, finished packaging libpsl.spec | 77 ++--- 1 file changed, 63 insertions(+), 14 deletions(-) --- diff --git a/libpsl.spec b/libpsl.spec index 5021cca..a165403 100644 --- a/libpsl.spec +++ b/libpsl.spec @@ -1,21 +1,26 @@ +# +# Conditional build: +%bcond_without static_libs # static library +# Summary: C library for the Publix Suffix List Summary(pl.UTF-8): Biblioteka C do obsługi listy przyrostków publicznych (Public Suffix List) Name: libpsl -Version: 0.5.1 -Release: 2 +Version: 0.6.0 +Release: 1 License: MIT Group: Networking Source0: https://github.com/rockdaboot/libpsl/archive/%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 3ef1aba32c2422b3527d86d3fb47c18e +# Source0-md5: 3fc6e6701c92216f2cae0340704dba2e URL: https://rockdaboot.github.io/libpsl -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: gettext-autopoint -BuildRequires: gettext-devel +BuildRequires: autoconf = 2.59 +BuildRequires: automake = 1:1.10 +BuildRequires: gettext-devel = 0.18.1 BuildRequires: glib2-devel -BuildRequires: gtk-doc +BuildRequires: gtk-doc = 1.15 BuildRequires: libicu-devel -BuildRequires: libxslt +BuildRequires: libtool = 2:2 +BuildRequires: libxslt-progs +BuildRequires: sed = 4.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -66,6 +71,7 @@ Libpsl: %package devel Summary: Development files for libpsl Summary(pl.UTF-8): Pliki programistyczne biblioteki libpsl +Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel @@ -76,9 +82,33 @@ use libpsl. Ten pakiet zawiera plik nagłówkowy do tworzenia aplikacji wykorzystujących bibliotekę libpsl. +%package static +Summary: Static libpsl library +Summary(pl.UTF-8): Statyczna biblioteka libpsl +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +Static libpsl library. + +%description static -l pl.UTF-8 +Statyczna biblioteka libpsl. + +%package apidocs +Summary: API documentation for libpsl library +Summary(pl.UTF-8): Dokumentacja API biblioteki libpsl +Group: Documentation + +%description apidocs +API documentation for libpsl library. + +%description apidocs -l pl.UTF-8 +Dokumentacja API biblioteki libpsl. + %package utils Summary: Commandline utility to explore the Public Suffix List Summary(pl.UTF-8): Narzędzie linii poleceń do eksplorowania listy przyrostków publicznych +Group: Applications/Networking Requires: %{name} = %{version}-%{release} %description utils @@ -95,14 +125,24 @@ ciasteczka jest akceptowalna dla domen itp. %prep %setup -q +# gettextize workaround +%{__sed} -i -e 's,po/Makefile\.in,,' configure.ac + %build -./autogen.sh +%{__gettextize} +%{__gtkdocize} +%{__libtoolize} +%{__aclocal} -I m4 +%{__autoconf} +%{__autoheader} +%{__automake} %configure \ --disable-silent-rules \ - --disable-static \ + %{!?with_static_libs:--disable-static} \ + --enable-gtk-doc \ --enable-man \ - --enable-gtk-doc + --with-html-dir=%{_gtkdocdir} %{__make} @@ -114,6 +154,8 @@ rm -rf $RPM_BUILD_ROOT DESTDIR=$RPM_BUILD_ROOT %{__rm} $RPM_BUILD_ROOT%{_datadir}/libpsl/test_psl.txt +# obsoleted by pkg-config +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libpsl.la %clean rm -rf $RPM_BUILD_ROOT @@ -123,7 +165,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc AUTHORS NEWS README.md +%doc AUTHORS COPYING NEWS README.md %attr(755,root,root) %{_libdir}/libpsl.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libpsl.so.0 @@ -133,9 +175,16 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/libpsl.h %{_pkgconfigdir}/libpsl.pc %{_mandir}/man3/libpsl.3* -#%{_datadir}/gtk-doc/html/libpsl/ %{_datadir}/%{name} +%files static +%defattr(644,root,root,755) +%{_libdir}/libpsl.a + +%files apidocs +%defattr(644,root,root,755) +%{_gtkdocdir}/libpsl + %files utils %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/psl gitweb: http://git.pld-linux.org/gitweb.cgi/packages/libpsl.git/commitdiff/421caf12418a56fd5c02e6aa00f00a37d4af1a10 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: libpsl: libpsl-0.6.0.tar.gz
Request by: qboosh Files fetched: 1 STORED: https://github.com/rockdaboot/libpsl/archive/0.6.0/libpsl-0.6.0.tar.gz 3fc6e6701c92216f2cae0340704dba2e libpsl-0.6.0.tar.gz Size: 85334 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-PyQt4] - build for both python 2 and 3 - separated -uic and QtDesigner-plugin-pyqt4 to make dual packages p
commit b7e0daabcae8906b30a2f915b82cc09ac82a2a43 Author: Jakub Bogusz qbo...@pld-linux.org Date: Fri Oct 31 21:24:19 2014 +0100 - build for both python 2 and 3 - separated -uic and QtDesigner-plugin-pyqt4 to make dual packages possible python-PyQt4.spec | 209 -- 1 file changed, 188 insertions(+), 21 deletions(-) --- diff --git a/python-PyQt4.spec b/python-PyQt4.spec index 2311e91..4e02131 100644 --- a/python-PyQt4.spec +++ b/python-PyQt4.spec @@ -1,11 +1,17 @@ +# TODO: __pycache__ for python3-PyQt4-uic +# +# Conditional build: +%bcond_without python2 # CPython 2.x modules +%bcond_without python3 # CPython 3.x modules + %definemodule PyQt4 # minimal required sip version %definesip_ver 2:4.16 # last qt version covered by these bindings (minimal required is currently 4.1.0) %defineqt_ver 4.8.6 -Summary: Python bindings for the Qt4 toolkit -Summary(pl.UTF-8): Dowiązania do toolkitu Qt4 dla Pythona +Summary: Python 2 bindings for the Qt4 toolkit +Summary(pl.UTF-8): Wiązania Pythona 2 do toolkitu Qt4 Name: python-%{module} Version: 4.11.2 Release: 1 @@ -38,18 +44,24 @@ BuildRequires: QtXmlPatterns-devel = %{qt_ver} BuildRequires: phonon-devel BuildRequires: pkgconfig BuildRequires: python-dbus-devel = 0.80 +%if %{with python2} +BuildRequires: python-dbus = 0.80 BuildRequires: python-sip-devel = %{sip_ver} +%endif +%if %{with python3} +BuildRequires: python3-dbus = 0.80 +BuildRequires: python3-sip-devel = %{sip_ver} +%endif BuildRequires: qt4-build = 4.3.3-3 BuildRequires: qt4-qmake = 4.3.3-3 BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) = 1.219 BuildRequires: sed = 4.0 -%pyrequires_eq python-libs +Requires: python-libs Requires: python-dbus = 0.80 Requires: python-sip = %{sip_ver} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define_noautoreqdep libGL.so.1 libGLU.so.1 %define_sipfilesdir%{_datadir}/sip %description @@ -59,39 +71,101 @@ QtDesigner, QtGui, QtHelp, QtMultimedia, QtNetwork, QtOpenGL, QtScript, QtScriptTools, QtSql, QtSvg, QtTest, QtWebKit, QtXml, QtXmlPatterns and phonon. +This package contains Python 2 bindings. + %description -l pl.UTF-8 -PyQt4 to zbiór dowiązań do Qt4 dla Pythona. Dowiązania zostały +PyQt4 to zbiór wiązań Qt4 dla Pythona. Dowiązania zostały zaimplementowane jako moduły Pythona: QtCore, QtDeclarative, QtDesigner, QtGui, QtHelp, QtMultimedia, QtNetwork, QtOpenGL, QtScript, QtScriptTools, QtSql, QtSvg, QtTest, QtWebKit, QtXml, QtXmlPatterns oraz phonon. +Ten pakiet zawiera wiązania Pythona 2. + +%package uic +Summary: pyuic4 development tool for Python 2 +Summary(pl.UTF-8): Narzędzie programistyczne pyuic4 dla Pythona 2 +Group: Development/Tools +Requires: %{name} = %{version}-%{release} + +%description uic +pyuic4 development tool for Python 2. + +%description uic -l pl.UTF-8 +Narzędzie programistyczne pyuic4 dla Pythona 2. + +%package -n python3-PyQt4 +Summary: Python 2 bindings for the Qt4 toolkit +Summary(pl.UTF-8): Wiązania Pythona 2 do toolkitu Qt4 +Group: Libraries/Python +Requires: python3-libs +Requires: python3-dbus = 0.80 +Requires: python3-sip = %{sip_ver} + +%description -n python3-PyQt4 +PyQt4 is a set of Python bindings for the Qt4 toolkit. The bindings +are implemented as a set of Python modules: QtCore, QtDeclarative, +QtDesigner, QtGui, QtHelp, QtMultimedia, QtNetwork, QtOpenGL, +QtScript, QtScriptTools, QtSql, QtSvg, QtTest, QtWebKit, QtXml, +QtXmlPatterns and phonon. + +This package contains Python 3 bindings. + +%description -n python3-PyQt4 -l pl.UTF-8 +PyQt4 to zbiór wiązań Qt4 dla Pythona. Dowiązania zostały +zaimplementowane jako moduły Pythona: QtCore, QtDeclarative, +QtDesigner, QtGui, QtHelp, QtMultimedia, QtNetwork, QtOpenGL, +QtScript, QtScriptTools, QtSql, QtSvg, QtTest, QtWebKit, QtXml, +QtXmlPatterns oraz phonon. + +Ten pakiet zawiera wiązania Pythona 3. + +%package -n python3-PyQt4-uic +Summary: pyuic4 development tool for Python 3 +Summary(pl.UTF-8): Narzędzie programistyczne pyuic4 dla Pythona 3 +Group: Development/Tools +Requires: python3-PyQt4 = %{version}-%{release} + +%description -n python3-PyQt4-uic +pyuic4 development tool for Python 3. + +%description -n python3-PyQt4-uic -l pl.UTF-8 +Narzędzie programistyczne pyuic4 dla Pythona 3. + %package devel -Summary: Files needed to build other bindings based on Qt4 -Summary(pl.UTF-8): Pliki potrzebne do budowania innych dowiązań opartych na Qt4 +Summary: SIP files needed to build other bindings based on Qt4 +Summary(pl.UTF-8): Pliki SIP potrzebne do budowania innych wiązań opartych na Qt4 Group: Development/Languages/Python -Requires: %{name} = %{version}-%{release} -Requires: python-sip-devel
[packages/wget] - BR: libuuid-devel pcre-devel zlib-devel
commit b583acb7d84c2c88361853e4c79be5837b533d32 Author: Jakub Bogusz qbo...@pld-linux.org Date: Fri Oct 31 21:53:58 2014 +0100 - BR: libuuid-devel pcre-devel zlib-devel wget.spec | 3 +++ 1 file changed, 3 insertions(+) --- diff --git a/wget.spec b/wget.spec index a709fdf..b06a158 100644 --- a/wget.spec +++ b/wget.spec @@ -35,11 +35,14 @@ BuildRequires: gettext-devel = 0.17 %{?with_gnutls:BuildRequires: gnutls-devel} BuildRequires: libidn-devel BuildRequires: libpsl-devel +BuildRequires: libuuid-devel %{!?with_gnutls:BuildRequires: openssl-devel = 0.9.7m} +BuildRequires: pcre-devel BuildRequires: perl-devel BuildRequires: tar = 1:1.22 BuildRequires: texinfo BuildRequires: xz +BuildRequires: zlib-devel Provides: webclient BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/wget.git/commitdiff/b583acb7d84c2c88361853e4c79be5837b533d32 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-feedparser] - rel 2; build python3 module, too
commit 877d2810f8cb7e9fbd560a7d4577c09978f8011f Author: Arkadiusz Miśkiewicz ar...@maven.pl Date: Fri Oct 31 22:19:07 2014 +0100 - rel 2; build python3 module, too python-feedparser.spec | 73 +++--- 1 file changed, 63 insertions(+), 10 deletions(-) --- diff --git a/python-feedparser.spec b/python-feedparser.spec index 54dd89d..4b7ff71 100644 --- a/python-feedparser.spec +++ b/python-feedparser.spec @@ -1,5 +1,7 @@ # # Conditional build: +%bcond_without python2 # CPython 2.x module +%bcond_without python3 # CPython 3.x module %bcond_withtests # perform make test (3 tests fail) %definemodule feedparser @@ -7,15 +9,23 @@ Summary: Parse RSS and Atom feeds in Python Summary(pl.UTF-8): Biblioteka Feed Parser dla Pythona Name: python-%{module} Version: 5.1.3 -Release: 1 +Release: 2 License: BSD Group: Libraries/Python Source0: http://feedparser.googlecode.com/files/feedparser-%{version}.tar.bz2 # Source0-md5: 6fb6372a1dc2f56d4d79d740b8f49f25 URL: http://feedparser.org/ -BuildRequires: python-devel = 1:2.3.0 BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) = 1.219 +%if %{with python2} +BuildRequires: python-devel = 1:2.3.0 +BuildRequires: python-distribute +%endif +%if %{with python3} +BuildRequires: python3-devel +BuildRequires: python3-distribute +BuildRequires: python3-modules +%endif Requires: python-modules BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -30,33 +40,76 @@ modules, including Dublin Core and Apple's iTunes extensions. %description -l pl.UTF-8 Ten pakiet umożliwia analizę źródeł RSS i Atom w Pythonie. +%package -n python3-%{module} +Summary: Parse RSS and Atom feeds in Python +Summary(pl.UTF-8): Biblioteka Feed Parser dla Pythona +Group: Libraries/Python +Requires: python3-modules + +%description -n python3-%{module} +Universal Feed Parser is a Python module for downloading and parsing +syndicated feeds. It can handle RSS 0.90, Netscape RSS 0.91, Userland +RSS 0.91, RSS 0.92, RSS 0.93, RSS 0.94, RSS 1.0, RSS 2.0, Atom 0.3, +Atom 1.0, and CDF feeds. It also parses several popular extension +modules, including Dublin Core and Apple's iTunes extensions. + +%description -n python3-%{module} -l pl.UTF-8 +Ten pakiet umożliwia analizę źródeł RSS i Atom w Pythonie. + %prep %setup -q -n %{module}-%{version} %build -%{__python} setup.py build -%if %{with tests} -cd %{module} -PYTHONPATH=build %{__python} feedparsertest.py +%if %{with python2} +%{__python} setup.py build --build-base build-2 +%{?with_tests:cd feedparser; PYTHONPATH=../build-2 %{__python} feedparsertest.py; cd ..} +%endif + +%if %{with python3} +%{__python3} setup.py build --build-base build-3 +%{?with_tests:cd feedparser; PYTHONPATH=../build-3 %{__python} feedparsertest.py; cd ..} %endif %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install \ - --skip-build \ - --optimize=2 \ - --root=$RPM_BUILD_ROOT + +%if %{with python2} +%{__python} setup.py \ +build --build-base build-2 \ +install --skip-build \ +--optimize=2 \ +--root=$RPM_BUILD_ROOT %py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir} %py_comp $RPM_BUILD_ROOT%{py_sitescriptdir} %py_postclean +%endif + +%if %{with python3} +%{__python3} setup.py \ +build --build-base build-3 \ +install --skip-build \ +--optimize=2 \ +--root=$RPM_BUILD_ROOT +%endif %clean rm -rf $RPM_BUILD_ROOT +%if %{with python2} %files %defattr(644,root,root,755) %doc LICENSE NEWS README %{py_sitescriptdir}/feedparser.py[co] %{py_sitescriptdir}/feedparser-*.egg-info +%endif + +%if %{with python3} +%files -n python3-%{module} +%defattr(644,root,root,755) +%doc LICENSE NEWS README +%{py3_sitescriptdir}/feedparser.py +%{py3_sitescriptdir}/__pycache__/feedparser.*.py[co] +%{py3_sitescriptdir}/feedparser-*.egg-info +%endif gitweb: http://git.pld-linux.org/gitweb.cgi/packages/python-feedparser.git/commitdiff/877d2810f8cb7e9fbd560a7d4577c09978f8011f ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/SimGear] - added updates for OpenSceneGraph API from upstream git
commit 05b683819eee8924af26f8faabdd71c974891e87 Author: Jan Rękorajski bagg...@pld-linux.org Date: Fri Oct 31 22:39:35 2014 +0100 - added updates for OpenSceneGraph API from upstream git OpenSceneGraph-3.3.2.patch | 485 + SimGear.spec | 3 + 2 files changed, 488 insertions(+) --- diff --git a/SimGear.spec b/SimGear.spec index 7d715a8..7f3a9df 100644 --- a/SimGear.spec +++ b/SimGear.spec @@ -10,11 +10,13 @@ License:GPL v2+ Group: Libraries Source0: ftp://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-%{version}.tar.bz2 # Source0-md5: d6aac26bf8876391a7d5f4381fc98c01 +Patch0:OpenSceneGraph-3.3.2.patch URL: http://simgear.sourceforge.net/ BuildRequires: OpenAL-devel BuildRequires: OpenGL-devel BuildRequires: OpenGL-glut-devel BuildRequires: OpenSceneGraph-devel =3.0.0 +BuildRequires: boost-devel BuildRequires: cmake BuildRequires: freealut-devel BuildRequires: libjpeg-devel @@ -70,6 +72,7 @@ Statyczne biblioteki SimGear. %prep %setup -q -n simgear-%{version} +%patch0 -p1 %build install -d build diff --git a/OpenSceneGraph-3.3.2.patch b/OpenSceneGraph-3.3.2.patch new file mode 100644 index 000..7779c06 --- /dev/null +++ b/OpenSceneGraph-3.3.2.patch @@ -0,0 +1,485 @@ +commit 791273c61de23d2ec383a270db27015d235a9938 +Author: Thomas Geymayer tom...@gmail.com +Date: Sat Aug 9 17:18:21 2014 +0200 + +Update for OpenSceneGraph 3.3.2 API changes. + +diff --git a/simgear/canvas/ODGauge.cxx b/simgear/canvas/ODGauge.cxx +index 5c547ea..4a2b7fa 100644 +--- a/simgear/canvas/ODGauge.cxx b/simgear/canvas/ODGauge.cxx +@@ -44,6 +44,7 @@ + #include osg/ShadeModel + #include osg/StateSet + #include osg/FrameBufferObject // for GL_DEPTH_STENCIL_EXT on Windows ++#include osg/Version + #include osgUtil/RenderBin + + #include cassert +@@ -266,7 +267,15 @@ namespace canvas + // + void ODGauge::reinit() + { +-osg::NodeCallback* cull_callback = camera ? camera-getCullCallback() : 0; ++osg::NodeCallback* cull_callback = ++ camera ++#if OSG_VERSION_LESS_THAN(3,3,2) ++ ? camera-getCullCallback() ++#else ++ ? dynamic_castosg::NodeCallback*(camera-getCullCallback()) ++#endif ++ : 0; ++ + clear(); + allocRT(cull_callback); + } +diff --git a/simgear/canvas/elements/CanvasElement.cxx b/simgear/canvas/elements/CanvasElement.cxx +index 478cfb8..f895292 100644 +--- a/simgear/canvas/elements/CanvasElement.cxx b/simgear/canvas/elements/CanvasElement.cxx +@@ -27,6 +27,7 @@ + #include osg/Drawable + #include osg/Geode + #include osg/Scissor ++#include osg/Version + + #include boost/algorithm/string/predicate.hpp + #include boost/foreach.hpp +@@ -649,7 +650,11 @@ namespace canvas + osg::BoundingBox Element::getBoundingBox() const + { + if( _drawable ) ++#if OSG_VERSION_LESS_THAN(3,3,2) + return _drawable-getBound(); ++#else ++ return _drawable-getBoundingBox(); ++#endif + + osg::BoundingBox bb; + +@@ -672,7 +677,13 @@ namespace canvas + return osg::BoundingBox(); + + osg::BoundingBox transformed; +-const osg::BoundingBox bb = _drawable-getBound(); ++const osg::BoundingBox bb = ++#if OSG_VERSION_LESS_THAN(3,3,2) ++ _drawable-getBound(); ++#else ++ _drawable-getBoundingBox(); ++#endif ++ + for(int i = 0; i 4; ++i) + transformed.expandBy( bb.corner(i) * m ); + +diff --git a/simgear/canvas/elements/CanvasImage.cxx b/simgear/canvas/elements/CanvasImage.cxx +index 4f4ffc7..c89c71a 100644 +--- a/simgear/canvas/elements/CanvasImage.cxx b/simgear/canvas/elements/CanvasImage.cxx +@@ -413,7 +413,14 @@ namespace canvas + child-getNameString() == visible + child-getBoolValue() ) + { +- CullCallback* cb = static_castCullCallback*(_geom-getCullCallback()); ++ CullCallback* cb = ++#if OSG_VERSION_LESS_THAN(3,3,2) ++static_castCullCallback* ++#else ++dynamic_castCullCallback* ++#endif ++( _geom-getCullCallback() ); ++ + if( cb ) + cb-cullNextFrame(); + } +diff --git a/simgear/canvas/elements/CanvasPath.cxx b/simgear/canvas/elements/CanvasPath.cxx +index ba5351f..9eddcb3 100644 +--- a/simgear/canvas/elements/CanvasPath.cxx b/simgear/canvas/elements/CanvasPath.cxx +@@ -20,6 +20,7 @@ + #include simgear/scene/util/parse_color.hxx + + #include osg/Drawable ++#include osg/Version + + #include vg/openvg.h + #include cassert +@@ -372,7 +373,13 @@ namespace canvas + /** +* Compute the bounding box +*/ +- virtual osg::BoundingBox computeBound() const ++ virtual osg::BoundingBox ++#if OSG_VERSION_LESS_THAN(3,3,2) ++ computeBound() ++#else ++ computeBoundingBox() ++#endif ++ const + { + if( _path == VG_INVALID_HANDLE || (_attributes_dirty PATH) ) + return
[packages/SimGear] - updated files
commit 36c43733ca483aee877e058f67644878aa670d2b Author: Jan Rękorajski bagg...@pld-linux.org Date: Fri Oct 31 23:10:14 2014 +0100 - updated files SimGear.spec | 3 +++ 1 file changed, 3 insertions(+) --- diff --git a/SimGear.spec b/SimGear.spec index 7f3a9df..31f9f93 100644 --- a/SimGear.spec +++ b/SimGear.spec @@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(644,root,root,755) +%dir %{_datadir}/SimGearCore +%{_datadir}/SimGearCore/SimGearCoreConfig.cmake +%{_datadir}/SimGearCore/SimGearCoreConfig-pld.cmake %attr(755,root,root) %{_libdir}/libSimGearCore.so %attr(755,root,root) %{_libdir}/libSimGearScene.so %{_includedir}/simgear gitweb: http://git.pld-linux.org/gitweb.cgi/packages/SimGear.git/commitdiff/36c43733ca483aee877e058f67644878aa670d2b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/mozilla-firefox] - up to 33.0.2
commit 37413542605678e1f929ba379cf388b064ad68ca Author: Jakub Bogusz qbo...@pld-linux.org Date: Fri Oct 31 23:15:26 2014 +0100 - up to 33.0.2 mozilla-firefox.spec | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) --- diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec index fd75346..46eab72 100644 --- a/mozilla-firefox.spec +++ b/mozilla-firefox.spec @@ -11,7 +11,7 @@ %bcond_without kerberos# disable krb5 support %bcond_withxulrunner # system xulrunner [no longer supported] # - disabled shared_js - https://bugzilla.mozilla.org/show_bug.cgi?id=1039964 -%bcond_withshared_js +%bcond_withshared_js # shared libmozjs library [broken] %if %{without xulrunner} # The actual sqlite version (see RHBZ#480989): @@ -24,12 +24,12 @@ Summary: Firefox Community Edition web browser Summary(pl.UTF-8): Firefox Community Edition - przeglądarka WWW Name: mozilla-firefox -Version: 33.0.1 +Version: 33.0.2 Release: 1 License: MPL v2.0 Group: X11/Applications/Networking Source0: http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2 -# Source0-md5: 5a1c4b0b2349e3db94b45bd3f03f9288 +# Source0-md5: 385ad037451f141b68515c73cad01704 Source3: %{name}.desktop Source4: %{name}.sh Source5: vendor.js @@ -48,6 +48,7 @@ BuildRequires:automake BuildRequires: bzip2-devel BuildRequires: cairo-devel = 1.10.2-5 BuildRequires: dbus-glib-devel = 0.60 +BuildRequires: freetype-devel = 1:2.1.8 BuildRequires: gcc-c++ = 6:4.4 BuildRequires: glib2-devel = 1:2.20 BuildRequires: gstreamer-devel = 1.0 @@ -55,7 +56,7 @@ BuildRequires:gstreamer-plugins-base-devel = 1.0 %{!?with_gtk3:BuildRequires: gtk+2-devel = 2:2.14} %{?with_gtk3:BuildRequires:gtk+3-devel = 3.0.0} %{?with_kerberos:BuildRequires:heimdal-devel = 0.7.1} -BuildRequires: hunspell-devel +BuildRequires: hunspell-devel = 1.2.3 BuildRequires: libIDL-devel = 0.8.0 BuildRequires: libdnet-devel BuildRequires: libevent-devel = 1.4.7 @@ -77,8 +78,8 @@ BuildRequires:perl-modules = 5.004 BuildRequires: pkgconfig BuildRequires: pkgconfig(libffi) = 3.0.9 BuildRequires: pulseaudio-devel -BuildRequires: python-modules -BuildRequires: python-virtualenv +BuildRequires: python-modules = 1:2.5 +BuildRequires: python-virtualenv = 1.9.1-4 BuildRequires: readline-devel BuildRequires: rpm = 4.4.9-56 BuildRequires: rpmbuild(macros) = 1.601 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/mozilla-firefox.git/commitdiff/37413542605678e1f929ba379cf388b064ad68ca ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/FlightGear] - updated cmake patch
commit 777ce029b72927dd330e8ce45af8d347e5d0855b Author: Jan Rękorajski bagg...@pld-linux.org Date: Fri Oct 31 23:58:04 2014 +0100 - updated cmake patch flightgear-cmake.patch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- diff --git a/flightgear-cmake.patch b/flightgear-cmake.patch index ff29651..5d84cb8 100644 --- a/flightgear-cmake.patch +++ b/flightgear-cmake.patch @@ -1,7 +1,6 @@ --- flightgear-2.10.0/utils/fgadmin/src/CMakeLists.txt-orig2012-06-26 22:06:15.0 +0200 +++ flightgear-2.10.0/utils/fgadmin/src/CMakeLists.txt 2013-03-22 14:09:25.876770608 +0100 -@@ -1,6 +1,6 @@ - +@@ -1,5 +1,5 @@ fltk_wrap_ui(FGAdminUI fgadmin.fl) -add_library(FGAdminUI ${FGAdminUI_FLTK_UI_SRCS}) +add_library(FGAdminUI STATIC ${FGAdminUI_FLTK_UI_SRCS}) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/FlightGear.git/commitdiff/777ce029b72927dd330e8ce45af8d347e5d0855b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit