[packages/zsh] do not unroll precmd alias when defining precmd function
commit 53e16d6187f3a6af10a9634294c6d23be7927f47 Author: Tomasz Pala Date: Sat Nov 7 09:43:41 2020 +0100 do not unroll precmd alias when defining precmd function zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/zshrc b/zshrc index 0eb27b6..86a8f00 100644 --- a/zshrc +++ b/zshrc @@ -39,7 +39,7 @@ PS1='[%n@%m %~]%(!.#.%\$) ' case "$TERM" in xterm*|nxterm|gnome*|rxvt*|konsole*) - precmd () { print -Pn "\e]0;%n@%m: %~\a" } + function precmd () { print -Pn "\e]0;%n@%m: %~\a" } bindkey '^[[H' beginning-of-line >/dev/null 2>&1 bindkey '^[[F' end-of-line >/dev/null 2>&1 bindkey '^[[A' history-beginning-search-backward >/dev/null 2>&1 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/zsh.git/commitdiff/53e16d6187f3a6af10a9634294c6d23be7927f47 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: openvpn-otp: v1.0.tar.gz 2d3809abca1909a3a8a55fa8e38d5c139faf3d59.patch
Request by: gotar Files fetched: 2 STORED: https://github.com/evgeny-gridasov/openvpn-otp/archive/v1.0.tar.gz 3ff2b8f9cc054ccac31f99e9ee704f67 v1.0.tar.gz Size: 27631 bytes STORED: https://github.com/evgeny-gridasov/openvpn-otp/commit/2d3809abca1909a3a8a55fa8e38d5c139faf3d59.patch b199454e79e9c9cb962cbde9626429a0 2d3809abca1909a3a8a55fa8e38d5c139faf3d59.patch Size: 4198 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/openvpn-otp] initial PLD release
commit 31adb860b9c7e740f7dae0752890e536cb4a8e6d Author: Tomasz Pala Date: Sat Dec 14 17:02:18 2019 +0100 initial PLD release openvpn-otp.spec | 60 1 file changed, 60 insertions(+) --- diff --git a/openvpn-otp.spec b/openvpn-otp.spec new file mode 100644 index 000..87d6c64 --- /dev/null +++ b/openvpn-otp.spec @@ -0,0 +1,60 @@ +Summary: OpenVPN HOTP/TOTP plugin +Summary(pl.UTF-8): Wtyczka HOTP/TOTP dla OpenVPN +Name: openvpn-otp +Version: 1.0 +Release: 1 +License: GPL v3 +Group: Networking/Daemons +Source0: https://github.com/evgeny-gridasov/openvpn-otp/archive/v%{version}.tar.gz +# Source0-md5: 3ff2b8f9cc054ccac31f99e9ee704f67 +Patch1: https://github.com/evgeny-gridasov/openvpn-otp/commit/2d3809abca1909a3a8a55fa8e38d5c139faf3d59.patch +# Patch1-md5: b199454e79e9c9cb962cbde9626429a0 +URL: https://github.com/evgeny-gridasov/openvpn-otp/ +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +BuildRequires: openssl-devel +BuildRequires: openvpn-devel +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%define_libdir %{_prefix}/%{_lib}/openvpn/plugins +%define_sysconfdir /etc/openvpn + +%description +Support for time based OTP and HMAC based OTP tokens for OpenVPN. +Compatible with Google Authenticator software token, other software +and hardware based OTP tokens. + +%description -l pl.UTF-8 +Wtyczka implementuje uwierzytelnianie hasłami jednorazowymi. + +%prep +%setup -q +%patch1 -p1 + +%build +%{__mkdir_p} m4 +%{__libtoolize} +%{__aclocal} -I m4 +%{__autoconf} +%{__autoheader} +%{__automake} +%configure \ + --with-openvpn-plugin-dir=%{_libdir} +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +%{__rm} $RPM_BUILD_ROOT%{_libdir}/openvpn-otp.la + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc README.md +%attr(755,root,root) %{_libdir}/%{name}.so gitweb: http://git.pld-linux.org/gitweb.cgi/packages/openvpn-otp.git/commitdiff/31adb860b9c7e740f7dae0752890e536cb4a8e6d ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/openvpn-otp] Created branch master
The branch 'master' was created. Summary of new commits: 31adb86... initial PLD release ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/gcc] 8.0.1 requires binutils >= 2.30
commit 20ae4a575cd3968ecc4a5c62d6e3e460f216be5c Author: Tomasz Pala Date: Sat Dec 14 16:28:15 2019 +0100 8.0.1 requires binutils >= 2.30 gcc.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/gcc.spec b/gcc.spec index d1bfd9d..2457980 100644 --- a/gcc.spec +++ b/gcc.spec @@ -125,7 +125,7 @@ URL:http://gcc.gnu.org/ BuildRequires: autoconf >= 2.64 %{?with_tests:BuildRequires: autogen >= 5.5.4} BuildRequires: automake >= 1:1.11.1 -BuildRequires: binutils >= 3:2.23 +BuildRequires: binutils >= 3:2.30 BuildRequires: bison BuildRequires: chrpath >= 0.13-2 %{?with_tests:BuildRequires: dejagnu >= 1.4.4} @@ -182,7 +182,7 @@ BuildRequires: texinfo >= 4.7 BuildRequires: xz BuildRequires: zlib-devel BuildConflicts:pdksh < 5.2.14-50 -Requires: binutils >= 3:2.23 +Requires: binutils >= 3:2.30 Requires: gmp >= 4.3.2 Requires: isl >= 0.15 Requires: libgcc = %{epoch}:%{version}-%{release} gitweb: http://git.pld-linux.org/gitweb.cgi/packages/gcc.git/commitdiff/20ae4a575cd3968ecc4a5c62d6e3e460f216be5c ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/curl] bump libbrotli version required as there was no SOVER++
commit 00b2a6ebb1548b03ad0213dcffac4a61e6cc7fdd Author: Tomasz Pala Date: Thu Dec 12 17:44:36 2019 +0100 bump libbrotli version required as there was no SOVER++ curl.spec | 1 + 1 file changed, 1 insertion(+) --- diff --git a/curl.spec b/curl.spec index d7cc63a..fed2fe3 100644 --- a/curl.spec +++ b/curl.spec @@ -119,6 +119,7 @@ Group: Libraries %{?with_ssh:Requires: libssh2 >= 1.2.8} %{?with_http2:Requires:nghttp2-libs >= 1.9.0} %if %{with ssl} && %{without gnutls} +Requires: libbrotli >= 1.0.0 Requires: openssl >= 1.0.1 %endif Suggests: ca-certificates gitweb: http://git.pld-linux.org/gitweb.cgi/packages/curl.git/commitdiff/00b2a6ebb1548b03ad0213dcffac4a61e6cc7fdd ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/qemu] fixed R: vte - the package is built with 2.91 (0.58.3) but requires the old version via forked packa
commit 4fd23c559d5b1e5a0cdc585c9803a96577c21a4e Author: Tomasz Pala Date: Sun Dec 8 11:39:25 2019 +0100 fixed R: vte - the package is built with 2.91 (0.58.3) but requires the old version via forked package (which doesn't P: vte anyway) qemu.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/qemu.spec b/qemu.spec index c18cbb7..b7edef8 100644 --- a/qemu.spec +++ b/qemu.spec @@ -128,7 +128,7 @@ BuildRequires: xorg-lib-libX11-devel BuildRequires: zlib-devel %if %{with gtk3} BuildRequires: gtk+3-devel >= 3.14.0 -%{?with_vte:BuildRequires: vte2.90-devel >= 0.32.0} +%{?with_vte:BuildRequires: vte-devel >= 0.32.0} %endif %if %{with user_static} BuildRequires: glib2-static @@ -179,7 +179,7 @@ Requires: usbredir >= 0.6 \ %endif \ %if %{with gtk3} \ Requires: gtk+3 >= 3.14.0 \ -%{?with_vte:Requires: vte2.90 >= 0.32.0} \ +%{?with_vte:Requires: vte >= 0.32.0} \ %endif # don't strip/chrpath anything in there; these are boot images, roms etc gitweb: http://git.pld-linux.org/gitweb.cgi/packages/qemu.git/commitdiff/4fd23c559d5b1e5a0cdc585c9803a96577c21a4e ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/qemu] updated R: libusb version - libusb_set_option
commit c43b327d886730e2ac13d6b7e20412ba1ed6c5d1 Author: Tomasz Pala Date: Sun Dec 8 11:06:59 2019 +0100 updated R: libusb version - libusb_set_option qemu.spec | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) --- diff --git a/qemu.spec b/qemu.spec index 91ca74a..c18cbb7 100644 --- a/qemu.spec +++ b/qemu.spec @@ -172,7 +172,7 @@ Requires: libfdt >= 1.4.2 \ %if %{with seccomp} \ Requires: libseccomp >= 2.3.0 \ %endif \ -Requires: libusb >= 1.0.13 \ +Requires: libusb >= 1.0.22 \ Requires: pixman >= 0.21.8 \ %if %{with usbredir} \ Requires: usbredir >= 0.6 \ @@ -708,10 +708,14 @@ Obsoletes:qemu-kvm-system-x86 QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. +This package provides the system emulator with x86 CPU. + %description system-x86 -l pl.UTF-8 QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający dobrą szybkość emulacji dzięki użyciu translacji dynamicznej. +Ten pakiet zawiera emulator systemu z procesorem x86. + %package system-xtensa Summary: QEMU system emulator for Xtensa Summary(pl.UTF-8): QEMU - emulator systemu z procesorem Xtensa @@ -1106,8 +1110,8 @@ fi %preun guest-agent if [ "$1" = "0" ]; then - %service qemu-ga stop - /sbin/chkconfig --del qemu-ga + %service qemu-ga stop + /sbin/chkconfig --del qemu-ga fi %systemd_preun qemu-guest-agent.service gitweb: http://git.pld-linux.org/gitweb.cgi/packages/qemu.git/commitdiff/c43b327d886730e2ac13d6b7e20412ba1ed6c5d1 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ncurses] 32-bit terminfo entries are used in main package (e.g. xterm-256color)
commit eef933fa85d271fbe52d32532462e97c7bd3739a Author: Tomasz Pala Date: Wed Sep 4 20:56:55 2019 +0200 32-bit terminfo entries are used in main package (e.g. xterm-256color) ncurses.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/ncurses.spec b/ncurses.spec index 6a86355..9823c54 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -45,6 +45,7 @@ BuildRequires:gcc-ada %{?with_cxx:BuildRequires: libstdc++-devel} %{?with_ada:BuildRequires: m4} BuildRequires: pkgconfig +Conflicts: slang-libs < 1:2.3.1a-2 Conflicts: terminfo < 5.4-0.6 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -127,7 +128,6 @@ Summary(pt_BR.UTF-8): Base de dados terminfo para terminais adicionais (menos us Group: Applications/Terminal Requires: %{name} = %{version}-%{release} Obsoletes: ncurses-extraterms -Conflicts: slang-libs < 1:2.3.1a-2 %if "%{_rpmversion}" >= "5" BuildArch: noarch %endif gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ncurses.git/commitdiff/eef933fa85d271fbe52d32532462e97c7bd3739a ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: openvpn-plugin-auth-ldap: ERRORS: auth-ldap-2.0.4.tar.gz
Request by: gotar scp problems: scp -pr -B -q ./tmp/e1e16667-4fae-4d86-b2cc-1ad2b97a8b91/c4985fbbf88042e28efd1521d03bf658/ pldd...@distfiles.pld-linux.org:ftp//by-md5/c/4: lost connection The command has exited with a non-zero status. 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/openvpn-plugin-auth-ldap] protect bind password and hide policies
commit 51a95da8fba8d5152750abbf58b92a6ffb35f634 Author: Tomasz Pala Date: Tue Aug 27 13:37:08 2019 +0200 protect bind password and hide policies openvpn-plugin-auth-ldap.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/openvpn-plugin-auth-ldap.spec b/openvpn-plugin-auth-ldap.spec index ca78a0a..3b738d0 100644 --- a/openvpn-plugin-auth-ldap.spec +++ b/openvpn-plugin-auth-ldap.spec @@ -66,5 +66,5 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) %doc LICENSE README.md -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/auth-ldap.conf +%config(noreplace) %verify(not md5 mtime size) %attr(640,root,root) %{_sysconfdir}/auth-ldap.conf %attr(755,root,root) %{_libdir}/openvpn-auth-ldap.so gitweb: http://git.pld-linux.org/gitweb.cgi/packages/openvpn-plugin-auth-ldap.git/commitdiff/51a95da8fba8d5152750abbf58b92a6ffb35f634 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/openvpn-plugin-auth-ldap] cleanup
commit 4e89452a5bfdc03363145e9649ede5049b27d668 Author: Tomasz Pala Date: Tue Aug 6 15:47:12 2019 +0200 cleanup openvpn-plugin-auth-ldap-make.patch | 25 - openvpn-plugin-auth-ldap.spec | 6 ++ 2 files changed, 2 insertions(+), 29 deletions(-) --- diff --git a/openvpn-plugin-auth-ldap.spec b/openvpn-plugin-auth-ldap.spec index b9474f5..ca78a0a 100644 --- a/openvpn-plugin-auth-ldap.spec +++ b/openvpn-plugin-auth-ldap.spec @@ -6,11 +6,10 @@ Summary(pl.UTF-8):Wtyczka Auth-LDAP dla OpenVPN Name: openvpn-plugin-auth-ldap Version: 2.0.4 Release: 1 -License: BSD +License: BSD + others Group: Applications Source0: https://github.com/threerings/openvpn-auth-ldap/archive/auth-ldap-%{version}.tar.gz # Source0-md5: c4985fbbf88042e28efd1521d03bf658 -Patch0:%{name}-make.patch Patch1:%{name}-objc-include.patch URL: https://github.com/threerings/openvpn-auth-ldap BuildRequires: autoconf @@ -35,7 +34,6 @@ użytkownika i hasłem poprzez LDAP. %prep %setup -q -n openvpn-auth-ldap-auth-ldap-%{version} -#%%patch0 -p1 #%%patch1 -p1 #:> objc.m4 @@ -67,6 +65,6 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc LICENSE README +%doc LICENSE README.md %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/auth-ldap.conf %attr(755,root,root) %{_libdir}/openvpn-auth-ldap.so diff --git a/openvpn-plugin-auth-ldap-make.patch b/openvpn-plugin-auth-ldap-make.patch deleted file mode 100644 index ecdfafa..000 --- a/openvpn-plugin-auth-ldap-make.patch +++ /dev/null @@ -1,25 +0,0 @@ auth-ldap-2.0.3/tests/Makefile.in~ 2006-08-01 06:51:52.0 +0300 -+++ auth-ldap-2.0.3/tests/Makefile.in 2008-12-02 14:35:09.606338237 +0200 -@@ -26,7 +26,7 @@ - CFLAGS+= @CHECK_CFLAGS@ -DTEST_DATA=\"${srcdir}/data\" - OBJCFLAGS+= @CHECK_CFLAGS@ -DTEST_DATA=\"${srcdir}/data\" - LIBS+=-lauth-ldap-testing $(OBJC_LIBS) $(LDAP_LIBS) @CHECK_LIBS@ --LDFLAGS+= -L${top_builddir}src $(LIBS) -+LDFLAGS+= -L${top_builddir}/src $(LIBS) - - # Recompile the tests every time - all: tests auth-ldap-2.0.3/check.m4~ 2006-04-27 05:54:34.0 +0300 -+++ auth-ldap-2.0.3/check.m4 2008-12-02 14:38:22.692976133 +0200 -@@ -20,8 +20,9 @@ - # Result is cached. - # - # Defines and substitutes the following vars: --# LIBCHECK_CFLAGS --# LIBCHECK_LIBS -+# CHECK_CFLAGS -+# CHECK_LIBS -+# CHECK_DIRS - # - # - gitweb: http://git.pld-linux.org/gitweb.cgi/packages/openvpn-plugin-auth-ldap.git/commitdiff/4e89452a5bfdc03363145e9649ede5049b27d668 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/openvpn-plugin-auth-ldap] set C++ std as declared in ubuntu_16.04_lts_build.sh
commit c0577bfec7903937ec5508fedb072210aab501ac Author: Tomasz Pala Date: Tue Aug 6 15:42:29 2019 +0200 set C++ std as declared in ubuntu_16.04_lts_build.sh openvpn-plugin-auth-ldap.spec | 1 + 1 file changed, 1 insertion(+) --- diff --git a/openvpn-plugin-auth-ldap.spec b/openvpn-plugin-auth-ldap.spec index 09477bc..b9474f5 100644 --- a/openvpn-plugin-auth-ldap.spec +++ b/openvpn-plugin-auth-ldap.spec @@ -46,6 +46,7 @@ użytkownika i hasłem poprzez LDAP. %{__autoheader} cp -f /usr/share/automake/config.sub . %configure \ + OBJCFLAGS="-std=gnu11" \ --with-objc-runtime=GNU \ --with-check=%{!?with_tests:/proc}%{?with_tests:/usr} \ --with-openldap=/usr \ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/openvpn-plugin-auth-ldap.git/commitdiff/c0577bfec7903937ec5508fedb072210aab501ac ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/openvpn-plugin-auth-ldap] I can reproduce the problem by removing aclocal.m4, try not breaking the provided one
commit 252388478d11c6ee69bb6e0d2c3ba6af004175b5 Author: Tomasz Pala Date: Tue Aug 6 15:31:53 2019 +0200 I can reproduce the problem by removing aclocal.m4, try not breaking the provided one openvpn-plugin-auth-ldap.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/openvpn-plugin-auth-ldap.spec b/openvpn-plugin-auth-ldap.spec index 74738c7..09477bc 100644 --- a/openvpn-plugin-auth-ldap.spec +++ b/openvpn-plugin-auth-ldap.spec @@ -38,11 +38,11 @@ użytkownika i hasłem poprzez LDAP. #%%patch0 -p1 #%%patch1 -p1 -> objc.m4 +#:> objc.m4 %build -%{__aclocal} -#%%{__autoconf} +#%%{__aclocal} +%{__autoconf} %{__autoheader} cp -f /usr/share/automake/config.sub . %configure \ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/openvpn-plugin-auth-ldap.git/commitdiff/252388478d11c6ee69bb6e0d2c3ba6af004175b5 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/openvpn-plugin-auth-ldap] nope
commit 8149f5abedd65adb406ec0959e2f0f3d1f13cb56 Author: Tomasz Pala Date: Tue Aug 6 15:21:35 2019 +0200 nope openvpn-plugin-auth-ldap.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- diff --git a/openvpn-plugin-auth-ldap.spec b/openvpn-plugin-auth-ldap.spec index b514a56..74738c7 100644 --- a/openvpn-plugin-auth-ldap.spec +++ b/openvpn-plugin-auth-ldap.spec @@ -19,7 +19,6 @@ BuildRequires:automake BuildRequires: gcc-objc BuildRequires: openldap-devel BuildRequires: openvpn-devel -BuildRequires: pkgconfig BuildRequires: re2c BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -43,7 +42,7 @@ użytkownika i hasłem poprzez LDAP. %build %{__aclocal} -%{__autoconf} +#%%{__autoconf} %{__autoheader} cp -f /usr/share/automake/config.sub . %configure \ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/openvpn-plugin-auth-ldap.git/commitdiff/8149f5abedd65adb406ec0959e2f0f3d1f13cb56 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/openvpn-plugin-auth-ldap] try to circumvent some autocr*p problem that doesn't manifest in my env
commit 272fd88e1e8905989dfd05b3e22cabfe0fe264d3 Author: Tomasz Pala Date: Tue Aug 6 15:07:25 2019 +0200 try to circumvent some autocr*p problem that doesn't manifest in my env openvpn-plugin-auth-ldap.spec | 1 + 1 file changed, 1 insertion(+) --- diff --git a/openvpn-plugin-auth-ldap.spec b/openvpn-plugin-auth-ldap.spec index fbd5756..b514a56 100644 --- a/openvpn-plugin-auth-ldap.spec +++ b/openvpn-plugin-auth-ldap.spec @@ -19,6 +19,7 @@ BuildRequires:automake BuildRequires: gcc-objc BuildRequires: openldap-devel BuildRequires: openvpn-devel +BuildRequires: pkgconfig BuildRequires: re2c BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/openvpn-plugin-auth-ldap.git/commitdiff/272fd88e1e8905989dfd05b3e22cabfe0fe264d3 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: openvpn-plugin-auth-ldap: auth-ldap-2.0.4.tar.gz
Request by: gotar Files fetched: 1 STORED: https://github.com/threerings/openvpn-auth-ldap/archive/auth-ldap-2.0.4.tar.gz c4985fbbf88042e28efd1521d03bf658 auth-ldap-2.0.4.tar.gz Size: 209800 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/openvpn-plugin-auth-ldap] upgrade to 2.0.4: "A decade of small fixes and improvements"
commit 1654a59064c2846521277c41186764723f46d8bb Author: Tomasz Pala Date: Tue Aug 6 15:00:10 2019 +0200 upgrade to 2.0.4: "A decade of small fixes and improvements" openvpn-plugin-auth-ldap.spec | 27 +-- 1 file changed, 9 insertions(+), 18 deletions(-) --- diff --git a/openvpn-plugin-auth-ldap.spec b/openvpn-plugin-auth-ldap.spec index 88e4517..fbd5756 100644 --- a/openvpn-plugin-auth-ldap.spec +++ b/openvpn-plugin-auth-ldap.spec @@ -1,31 +1,22 @@ -# TODO -# - compiled with gcc 4.7 (libobjc.so.4) it crashes -# Jan 23 13:47:12 pontus openvpn[32621]: OpenVPN 2.2.1 x86_64-pld-linux [SSL] [LZO2] [EPOLL] [PKCS11] [eurephia] built on Jul 7 2011 -# Jan 23 13:47:12 pontus kernel: [38178686.496394] openvpn[32621]: segfault at 0 ip 7ff3b02c4243 sp 7fffe923bd20 error 4 in libobjc.so.4.0.0[7ff3b02b6000+16000] -# Jan 23 13:47:12 pontus openvpn[32621]: NOTE: the current --script-security setting may allow this configuration to call user-defined scripts -# Jan 23 13:47:12 pontus openvpn: /usr/sbin/openvpn startup failed -# similarily to http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=641811 -# if built with gcc 4.6 (libobjc.so.3) it does not crash! -# # Conditional build: %bcond_withtests # check-based tests Summary: OpenVPN Auth-LDAP Plugin Summary(pl.UTF-8): Wtyczka Auth-LDAP dla OpenVPN Name: openvpn-plugin-auth-ldap -Version: 2.0.3 -Release: 9 +Version: 2.0.4 +Release: 1 License: BSD Group: Applications -Source0: http://openvpn-auth-ldap.googlecode.com/files/auth-ldap-%{version}.tar.gz -# Source0-md5: 03dedc57efc8d4fc2ffe2c014121299d +Source0: https://github.com/threerings/openvpn-auth-ldap/archive/auth-ldap-%{version}.tar.gz +# Source0-md5: c4985fbbf88042e28efd1521d03bf658 Patch0:%{name}-make.patch Patch1:%{name}-objc-include.patch -URL: http://code.google.com/p/openvpn-auth-ldap/ +URL: https://github.com/threerings/openvpn-auth-ldap BuildRequires: autoconf BuildRequires: automake %{?with_tests:BuildRequires: check} -BuildRequires: gcc-objc < 6:4.7 +BuildRequires: gcc-objc BuildRequires: openldap-devel BuildRequires: openvpn-devel BuildRequires: re2c @@ -43,9 +34,9 @@ Wtyczka openvpn-auth-ldap implementuje uwierzytelnianie nazwą użytkownika i hasłem poprzez LDAP. %prep -%setup -q -n auth-ldap-%{version} -%patch0 -p1 -%patch1 -p1 +%setup -q -n openvpn-auth-ldap-auth-ldap-%{version} +#%%patch0 -p1 +#%%patch1 -p1 > objc.m4 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/openvpn-plugin-auth-ldap.git/commitdiff/1654a59064c2846521277c41186764723f46d8bb ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xournal] upgraded to 0.4.8.2016
commit 9e9396a958038e101b0e39cae930250222322427 Author: Tomasz Pala Date: Fri Jun 21 09:27:28 2019 +0200 upgraded to 0.4.8.2016 xournal-zlib.patch | 6 +++--- xournal.spec | 17 + 2 files changed, 12 insertions(+), 11 deletions(-) --- diff --git a/xournal.spec b/xournal.spec index c7d55b5..0e14b72 100644 --- a/xournal.spec +++ b/xournal.spec @@ -1,22 +1,23 @@ Summary: Xournal - application for notetaking, sketching, keeping a journal using a stylus Summary(pl.UTF-8): Xournal - aplikacja do tworzenia notatek, szkicowania i prowadzenia dziennika pisakiem Name: xournal -Version: 0.4.5 -Release: 4 -License: GPL +Version: 0.4.8.2016 +Release: 1 +License: GPL v2+ Group: X11/Applications Source0: http://downloads.sourceforge.net/xournal/%{name}-%{version}.tar.gz -# Source0-md5: 795e4396ded2b67766eb2926be1fb4a9 +# Source0-md5: a594f475d9b93fbca0aac43d47c2de22 Patch0:%{name}-zlib.patch Patch1:%{name}-poppler-api.patch URL: http://xournal.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake BuildRequires: gettext-tools -BuildRequires: gtk+2-devel >= 2:2.4 +BuildRequires: gtk+2-devel >= 2:2.10 BuildRequires: libgnomecanvas-devel >= 2.4 +BuildRequires: pango-devel >= 1.0 BuildRequires: pkgconfig -BuildRequires: poppler-glib-devel +BuildRequires: poppler-glib-devel >= 0.5.4 BuildRequires: rpmbuild(macros) >= 1.357 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -33,7 +34,7 @@ Journal czy innych alternatyw takich jak Jarnal i Gournal. %prep %setup -q %patch0 -p0 -%patch1 -p0 +#%%patch1 -p0 %build %{__aclocal} @@ -61,6 +62,6 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README src/TODO -%attr(755,root,root) %{_bindir}/* +%attr(755,root,root) %{_bindir}/%{name} %{_datadir}/%{name} %{_desktopdir}/%{name}.desktop diff --git a/xournal-zlib.patch b/xournal-zlib.patch index 59723e3..2fa9e97 100644 --- a/xournal-zlib.patch +++ b/xournal-zlib.patch @@ -1,11 +1,11 @@ --- configure.in~ 2009-10-02 07:42:02.0 +0100 +++ configure.in 2010-07-31 12:02:39.862582539 +0100 -@@ -11,7 +11,7 @@ +@@ -13,7 +13,7 @@ AC_PROG_RANLIB AC_HEADER_STDC --pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4" -+pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4 zlib" +-pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4 pangoft2 >= 1.0" ++pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4 pangoft2 >= 1.0 zlib" PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) AC_SUBST(PACKAGE_CFLAGS) AC_SUBST(PACKAGE_LIBS) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xournal.git/commitdiff/9e9396a958038e101b0e39cae930250222322427 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: xournal: xournal-0.4.8.2016.tar.gz
Request by: gotar Files fetched: 1 STORED: http://downloads.sourceforge.net/xournal/xournal-0.4.8.2016.tar.gz a594f475d9b93fbca0aac43d47c2de22 xournal-0.4.8.2016.tar.gz Size: 646082 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/squid] do not use builder's CPU instruction set, leads to SIGILL on older x86_64
commit 6bbc9448314c980b125fa8ae8c10ec85915fb915 Author: Tomasz Pala Date: Wed May 22 08:27:07 2019 +0200 do not use builder's CPU instruction set, leads to SIGILL on older x86_64 squid.spec | 1 + 1 file changed, 1 insertion(+) --- diff --git a/squid.spec b/squid.spec index c11345c..7c2e273 100644 --- a/squid.spec +++ b/squid.spec @@ -647,6 +647,7 @@ Ten pakiet zawiera skrypty perlowe i dodatkowe programy dla Squida. %configure \ --disable-silent-rules \ --disable-strict-error-checking \ + --disable-arch-native \ --with-default-user=squid \ --with-logdir=/var/log/squid \ --with-swapdir=/var/cache/squid \ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/squid.git/commitdiff/6bbc9448314c980b125fa8ae8c10ec85915fb915 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/postgrey] restored daemon() invocation
commit 51133ff813b7f5c0034881c74644664df687af5d Author: Tomasz Pala Date: Thu Aug 9 19:09:16 2018 +0200 restored daemon() invocation postgrey.init | 9 ++--- 1 file changed, 2 insertions(+), 7 deletions(-) --- diff --git a/postgrey.init b/postgrey.init index 81175d7..24e5a5e 100644 --- a/postgrey.init +++ b/postgrey.init @@ -40,14 +40,9 @@ case "$1" in # Check if the service is already running? if [ ! -f /var/lock/subsys/postgrey ]; then msg_starting postgrey - /usr/sbin/postgrey -d --pidfile=/var/run/postgrey.pid $OPTIONS + daemon /usr/sbin/postgrey -d --pidfile=/var/run/postgrey.pid $OPTIONS RETVAL=$? - if [ $RETVAL -eq 0 ]; then - ok - touch /var/lock/subsys/postgrey - else - fail - fi + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/postgrey else msg_already_running postgrey fi gitweb: http://git.pld-linux.org/gitweb.cgi/packages/postgrey.git/commitdiff/51133ff813b7f5c0034881c74644664df687af5d ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/postgrey] pidof -x postgrey doesn't return PID, pass pidfile to status(), fixed start msg
commit e6ff7208cec7c9d5df023b4cfafcca5093243314 Author: Tomasz Pala Date: Tue Aug 7 10:43:16 2018 +0200 pidof -x postgrey doesn't return PID, pass pidfile to status(), fixed start msg postgrey.init | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) --- diff --git a/postgrey.init b/postgrey.init index 1aacced..81175d7 100644 --- a/postgrey.init +++ b/postgrey.init @@ -42,7 +42,12 @@ case "$1" in msg_starting postgrey /usr/sbin/postgrey -d --pidfile=/var/run/postgrey.pid $OPTIONS RETVAL=$? - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/postgrey + if [ $RETVAL -eq 0 ]; then + ok + touch /var/lock/subsys/postgrey + else + fail + fi else msg_already_running postgrey fi @@ -72,7 +77,7 @@ case "$1" in fi ;; status) - status postgrey + status --pidfile /var/run/postgrey.pid postgrey exit $? ;; *) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/postgrey.git/commitdiff/e6ff7208cec7c9d5df023b4cfafcca5093243314 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/postgrey] fixed pidfile header (used by systemd), do not wrap with daemon() - these date back to initial commi
commit e8e7d086492bf6a39954fbddf6271ac95eacfcec Author: Tomasz Pala Date: Tue Aug 7 10:02:19 2018 +0200 fixed pidfile header (used by systemd), do not wrap with daemon() - these date back to initial commit; always remove lockfile on stop() postgrey.init | 6 +++--- postgrey.spec | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) --- diff --git a/postgrey.spec b/postgrey.spec index 971bd69..745aa70 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -3,7 +3,7 @@ Summary:Postfix Greylisting Policy Server Summary(pl.UTF-8): Serwer do polityki "szarych list" dla Postfiksa Name: postgrey Version: 1.37 -Release: 1 +Release: 2 License: GPL v2 Group: Networking/Daemons Source0: http://postgrey.schweikert.ch/pub/%{name}-%{version}.tar.gz diff --git a/postgrey.init b/postgrey.init index 172f5f3..1aacced 100644 --- a/postgrey.init +++ b/postgrey.init @@ -6,7 +6,7 @@ # description: Postfix Greylisting Policy Server # # processname: postgrey -# pidfile: /var/run/greylist.pid +# pidfile: /var/run/postgrey.pid # # Source function library @@ -40,7 +40,7 @@ case "$1" in # Check if the service is already running? if [ ! -f /var/lock/subsys/postgrey ]; then msg_starting postgrey - daemon /usr/sbin/postgrey -d --pidfile=/var/run/postgrey.pid $OPTIONS + /usr/sbin/postgrey -d --pidfile=/var/run/postgrey.pid $OPTIONS RETVAL=$? [ $RETVAL -eq 0 ] && touch /var/lock/subsys/postgrey else @@ -51,10 +51,10 @@ case "$1" in if [ -f /var/lock/subsys/postgrey ]; then msg_stopping postgrey killproc postgrey - rm -f /var/lock/subsys/postgrey >/dev/null 2>&1 else msg_not_running postgrey fi + rm -f /var/lock/subsys/postgrey >/dev/null 2>&1 ;; restart) $0 stop gitweb: http://git.pld-linux.org/gitweb.cgi/packages/postgrey.git/commitdiff/e8e7d086492bf6a39954fbddf6271ac95eacfcec ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/mailcap] lynx doesn't support copiousoutput, stop it from using such handlers
commit acdc7baf611fb38b839c77a47e3eb460629452c1 Author: Tomasz PalaDate: Mon Apr 2 10:58:13 2018 +0200 lynx doesn't support copiousoutput, stop it from using such handlers mailcap | 48 mailcap.spec | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) --- diff --git a/mailcap.spec b/mailcap.spec index da40406..2d2a75b 100644 --- a/mailcap.spec +++ b/mailcap.spec @@ -16,7 +16,7 @@ Summary(pt_BR.UTF-8): Define aplicações auxiliares multimídia para vários pr Summary(tr.UTF-8): Çeşitli programlar için çokluortam yardımcı uygulamaları tanımlar Name: mailcap Version: %{ver} -Release: 3 +Release: 4 License: Public Domain Group: Base Source0: https://fedorahosted.org/released/mailcap/%{name}-%{fcver}.tar.xz diff --git a/mailcap b/mailcap index 5faf4d9..4c5f3c4 100644 --- a/mailcap +++ b/mailcap @@ -2,9 +2,9 @@ image/*; /usr/bin/eog %s; test=[ -n "$DISPLAY" -a -x /usr/bin/eog ] image/*; /usr/bin/qiv -Rl %s; test=[ -n "$DISPLAY" ] image/*; /usr/bin/asciiview %s; test=[ -z "$DISPLAY" ]; needsterminal image/*; /usr/bin/cacaview %s; test=[ -z "$DISPLAY" ]; needsterminal -image/*; /usr/bin/identify -verbose %s; copiousoutput +image/*; /usr/bin/identify -verbose %s; copiousoutput; test=[ -z "$LYNX_VERSION" ] -audio/mpeg; /usr/bin/id3v2 -l %s; copiousoutput +audio/mpeg; /usr/bin/id3v2 -l %s; copiousoutput; test=[ -z "$LYNX_VERSION" ] audio/mod; /usr/bin/mikmod %s @@ -20,13 +20,13 @@ video/mpeg; /usr/bin/mplayer -vc null -vo null %s; test=[ -z "$DISPLAY" ] video/mpeg; /usr/bin/xterm -name mplayer -e /usr/bin/mplayer %s & /bin/sleep 1; test=[ -n "$DISPLAY" ] application/pdf; /usr/bin/xpdf %s; test=[ -n "$DISPLAY" ] -application/pdf; /usr/bin/pdftotext -layout -nopgbrk %s -; copiousoutput +application/pdf; /usr/bin/pdftotext -layout -nopgbrk %s -; copiousoutput; test=[ -z "$LYNX_VERSION" ] application/postscript; /usr/bin/gv -safer %s; test=[ -n "$DISPLAY" ] -application/postscript; /usr/bin/ps2ascii %s; copiousoutput +application/postscript; /usr/bin/ps2ascii %s; copiousoutput; test=[ -z "$LYNX_VERSION" ] application/x-dvi; /usr/bin/xdvi %s; test=[ -n "$DISPLAY" ] -application/x-dvi; /usr/bin/dvi2tty -w123 %s; copiousoutput +application/x-dvi; /usr/bin/dvi2tty -w123 %s; copiousoutput; test=[ -z "$LYNX_VERSION" ] text/html; /usr/bin/htmlview %s; copiousoutput; test=[ -x /usr/bin/htmlview ] text/html; /usr/bin/elinks %s; nametemplate=%s.html; test=[ -z "$DISPLAY" ] @@ -37,11 +37,11 @@ text/html; /usr/bin/elinks -dump -eval 'set document.codepage.assume = "%{charse application/x-shockwave-flash; /usr/bin/swfplayer %s & sleep 2; test=[ -n "$DISPLAY" ] -application/rtf; /usr/bin/unrtf --nopict --text --quiet %s; copiousoutput +application/rtf; /usr/bin/unrtf --nopict --text --quiet %s; copiousoutput; test=[ -z "$LYNX_VERSION" ] -application/vnd.oasis.opendocument.presentation; odt2txt %s; copiousoutput; test=[ -z "$DISPLAY" ] -application/vnd.oasis.opendocument.spreadsheet; odt2txt %s; copiousoutput; test=[ -z "$DISPLAY" ] -application/vnd.oasis.opendocument.text; odt2txt %s; copiousoutput; test=[ -z "$DISPLAY" ] +application/vnd.oasis.opendocument.presentation;odt2txt %s; copiousoutput; test=[ -z "$LYNX_VERSION" -a -z "$DISPLAY" ] +application/vnd.oasis.opendocument.spreadsheet; odt2txt %s; copiousoutput; test=[ -z "$LYNX_VERSION" -a -z "$DISPLAY" ] +application/vnd.oasis.opendocument.text; odt2txt %s; copiousoutput; test=[ -z "$LYNX_VERSION" -a -z "$DISPLAY" ] application/vnd.sun.xml.writer; tmp=`/bin/mktemp -d %s.XX`\; \ cd "$tmp"\; /usr/bin/soffice2html.pl %s\; \ @@ -58,7 +58,7 @@ application/vnd.sun.xml.writer; tmp=`/bin/mktemp -d %s.XX`\; \ application/vnd.sun.xml.writer; tmp=`/bin/mktemp -d %s.XX`\; \ cd "$tmp"\; /usr/bin/soffice2html.pl %s\; \ /usr/bin/elinks -dump content.html\; \ - /bin/rm -rf "$tmp"; copiousoutput + /bin/rm -rf "$tmp"; copiousoutput; test=[ -z "$LYNX_VERSION" ] application/msword; tmp=`/bin/mktemp -d %s.XX`\; \ /usr/bin/wvHtml %s --targetdir="$tmp" page.html -1\; \ @@ -75,7 +75,7 @@ application/msword; tmp=`/bin/mktemp -d %s.XX`\; \ application/msword; tmp=`/bin/mktemp -d %s.XX`\; \ /usr/bin/wvHtml %s --targetdir="$tmp" page.html -1\; \ /usr/bin/elinks -dump "$tmp/page.html"\; \ - /bin/rm -rf "$tmp"; copiousoutput + /bin/rm -rf "$tmp"; copiousoutput; test=[ -z "$LYNX_VERSION" ] application/vnd.ms-excel; tmp=`/bin/mktemp -d %s.XX`\; \ /usr/bin/xlhtml -a %s > "$tmp/page.html"\; \ @@ -92,7 +92,7 @@ application/vnd.ms-excel; tmp=`/bin/mktemp -d %s.XX`\; \ application/vnd.ms-excel; tmp=`/bin/mktemp -d %s.XX`\; \ /usr/bin/xlhtml -a %s > "$tmp/page.html"\; \ /usr/bin/elinks -dump "$tmp/page.html"\; \ - /bin/rm -rf "$tmp"; copiousoutput + /bin/rm -rf
[packages/lesspipe] less forking, cosmetics
commit 37b506f97ecdc3d46831028ca18391ce4da5164d Author: Tomasz PalaDate: Mon Apr 2 10:28:43 2018 +0200 less forking, cosmetics lesspipe.sh | 20 1 file changed, 8 insertions(+), 12 deletions(-) --- diff --git a/lesspipe.sh b/lesspipe.sh index d60d932..7fc3fd1 100755 --- a/lesspipe.sh +++ b/lesspipe.sh @@ -122,25 +122,21 @@ lesspipe() { *.csr) openssl req -noout -text -in "$1" ;; *.crl) openssl crl -noout -text -in "$1" ;; *.crt) openssl x509 -noout -text -in "$1" ;; - *.p7s) openssl pkcs7 -noout -text -in "$1" -print_certs -inform DER;; + *.p7s) openssl pkcs7 -noout -text -in "$1" -print_certs -inform DER ;; # gnupg armored files *.asc) command -v gpg >/dev/null && { gpg -nv --homedir=/dev/null "$1" || : ; } || gpg2 -nv --homedir=/dev/null "$1" ;; *.gpg) gpg -d "$1" ;; *.so) library_info "$1" ;; - *.ts) dvbsnoop -s ts -hideproginfo -nohexdumpbuffer -tssubdecode -n 1000 -if "$1";; + *.ts) dvbsnoop -s ts -hideproginfo -nohexdumpbuffer -tssubdecode -n 1000 -if "$1" ;; # Possible manual pages *.1|*.2|*.3|*.4|*.5|*.6|*.7|*.8|*.9|*.l|*.n|*.man) - FILE=$(file -L "$1") # groff src - FILE=$(echo $FILE | cut -d ' ' -f 2) - if [ "$FILE" = "troff" ]; then - groff -s -p -t -e -Tlatin1 -mandoc "$1" - fi + FILE=$(file -L "$1" | cut -d ' ' -f 2) # groff src + [ "$FILE" = 'troff' ] && groff -s -p -t -e -Tlatin1 -mandoc "$1" || return 1 ;; # possible sqlite3 *.db) - FILE=$(file -bL "$1") - FILE=$(echo $FILE | cut -d , -f 1) - [ "$FILE" = "SQLite 3.x database" ] && sqlite3 "$1" .dump + FILE=$(file -bL "$1" | cut -d , -f 1) + [ "$FILE" = 'SQLite 3.x database' ] && sqlite3 "$1" .dump || return 1 ;; *) case $TERM in @@ -157,8 +153,8 @@ lesspipe() { esac } -if [ -d "$1" ] ; then +if [ -d "$1" ]; then /bin/ls -alF -- "$1" -else +elif [ -f "$1" ]; then lesspipe "$1" 2> /dev/null fi gitweb: http://git.pld-linux.org/gitweb.cgi/packages/lesspipe.git/commitdiff/9fd8fc87f369d96eab47fe3565e831b7d7c8811b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/lesspipe] sqlite3 extension, run-mailcap without DISPLAY and another pager - solved here instead of mailcap [2
commit 9fd8fc87f369d96eab47fe3565e831b7d7c8811b Author: Tomasz PalaDate: Mon Apr 2 10:35:46 2018 +0200 sqlite3 extension, run-mailcap without DISPLAY and another pager - solved here instead of mailcap [2e19c8e1da5875a5b895c46a127621c223e1f208] highlight --no-trailing-nl available since 2.16 lesspipe.sh | 6 +++--- lesspipe.spec | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) --- diff --git a/lesspipe.spec b/lesspipe.spec index 22b2c40..76ed4b7 100644 --- a/lesspipe.spec +++ b/lesspipe.spec @@ -6,7 +6,7 @@ Summary:Input preprocessor for less Summary(pl.UTF-8): Preprocesor wejścia dla narzędzia less Name: lesspipe Version: 1.57 -Release: 3 +Release: 4 License: GPL v2 Group: Applications/Text Source0: %{name}.sh @@ -17,6 +17,7 @@ Suggests: highlight >= 3.0 Suggests: mailcap >= 2.3 Suggests: objdump Suggests: openssl-tools +Conflicts: highlight < 2.16 Conflicts: less < 394-7.1 Conflicts: tar < 1:1.22 BuildArch: noarch diff --git a/lesspipe.sh b/lesspipe.sh index 7fc3fd1..9e5bd8f 100755 --- a/lesspipe.sh +++ b/lesspipe.sh @@ -134,7 +134,7 @@ lesspipe() { [ "$FILE" = 'troff' ] && groff -s -p -t -e -Tlatin1 -mandoc "$1" || return 1 ;; # possible sqlite3 - *.db) + *.db|*.sqlite3) FILE=$(file -bL "$1" | cut -d , -f 1) [ "$FILE" = 'SQLite 3.x database' ] && sqlite3 "$1" .dump || return 1 ;; @@ -145,8 +145,8 @@ lesspipe() { *) output=ansi;; esac - run-mailcap "$1" || { - echo "$LESS" | grep -qi r || ps -p $PPID,$(ps -p $PPID -oppid=) -oargs= | grep -qiw -- -r && highlight --out-format=$output --style=darkblue "$1"; + DISPLAY= run-mailcap --no-pager "$1" || { + echo "$LESS" | grep -qi r || ps -p $PPID,$(ps -p $PPID -oppid=) -oargs= | grep -qiw -- -r && highlight --validate-input --no-trailing-nl --out-format=$output --style=darkblue "$1"; } # Check to see if binary, if so -- view with 'strings' # FILE=$(file -L "$1") gitweb: http://git.pld-linux.org/gitweb.cgi/packages/lesspipe.git/commitdiff/9fd8fc87f369d96eab47fe3565e831b7d7c8811b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/mailcap] C: lesspipe invoking run-mailcap without --no-pager TODO: consider repatching with 5fdfbdab4d38263ea
commit 065819109b17ee15d9d3362bb95a0fe2c9eed5dd Author: Tomasz PalaDate: Mon Apr 2 10:16:58 2018 +0200 C: lesspipe invoking run-mailcap without --no-pager TODO: consider repatching with 5fdfbdab4d38263ea63cb33783b2f76d49c0037c mailcap.spec | 1 + 1 file changed, 1 insertion(+) --- diff --git a/mailcap.spec b/mailcap.spec index 1e822a9..da40406 100644 --- a/mailcap.spec +++ b/mailcap.spec @@ -67,6 +67,7 @@ Suggests: X11 Suggests: xterm %endif %{?with_tests:BuildRequires:perl-base} +Conflicts: lesspipe < 1.57-4 Conflicts: rpm < 4.4.9 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/mailcap.git/commitdiff/065819109b17ee15d9d3362bb95a0fe2c9eed5dd ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/mailcap] run-mailcap updated from upstream (Debian mime-support) 3.48 to 3.60 - security fixes plus perl 5.25
commit 77cff387d9b0edd292d87cc21d8e43fbb69b78eb Author: Tomasz PalaDate: Mon Apr 2 10:04:00 2018 +0200 run-mailcap updated from upstream (Debian mime-support) 3.48 to 3.60 - security fixes plus perl 5.25+ compliance mailcap.spec | 10 ++- run-mailcap | 229 +-- run-mailcap-mktemp.patch | 16 3 files changed, 146 insertions(+), 109 deletions(-) --- diff --git a/mailcap.spec b/mailcap.spec index be4c359..1e822a9 100644 --- a/mailcap.spec +++ b/mailcap.spec @@ -16,16 +16,18 @@ Summary(pt_BR.UTF-8): Define aplicações auxiliares multimídia para vários pr Summary(tr.UTF-8): Çeşitli programlar için çokluortam yardımcı uygulamaları tanımlar Name: mailcap Version: %{ver} -Release: 2 +Release: 3 License: Public Domain Group: Base Source0: https://fedorahosted.org/released/mailcap/%{name}-%{fcver}.tar.xz # Source0-md5: d8d66b3a458f0da327a7c4edfff911a1 Source1: %{name} Source2: %{name}.4 +# https://anonscm.debian.org/git/collab-maint/mime-support.git/log/run-mailcap Source3: run-%{name} Source4: run-%{name}.man Patch0:mime.types.patch +Patch1:run-mailcap-mktemp.patch URL: http://git.fedorahosted.org/git/?p=mailcap.git BuildRequires: rpm >= 4.4.9-56 BuildRequires: tar >= 1:1.22 @@ -109,7 +111,8 @@ paketini kullanamalarına olanak sağlar (zgv kurulmuş olmalı). %prep %setup -q -n %{name}-%{fcver} %patch0 -p1 -cp -a %{SOURCE1} mailcap +cp -a %{SOURCE1} %{SOURCE3} . +%patch1 %if "%{pld_release}" == "ac" %{__sed} -i -e 's,/usr/bin/xterm,/usr/X11R6/bin/xterm,g' mailcap @@ -123,10 +126,11 @@ cp -a %{SOURCE1} mailcap %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_mandir}/man{1,4},%{_bindir}} + cp -p mailcap mime.types $RPM_BUILD_ROOT%{_sysconfdir} cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man4 cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1/run-%{name}.1 -install -p %{SOURCE3} $RPM_BUILD_ROOT%{_bindir} +cp -p run-mailcap $RPM_BUILD_ROOT%{_bindir} %clean rm -rf $RPM_BUILD_ROOT diff --git a/run-mailcap b/run-mailcap index 851cd13..8ef4665 100644 --- a/run-mailcap +++ b/run-mailcap @@ -9,10 +9,13 @@ # ### +use Encode qw(decode); +use I18N::Langinfo qw(langinfo CODESET); +use File::Spec; -$debug=0; +$debug=($ENV{RUN_MAILCAP_DEBUG} || 0); $norun=0; -$pager=0; +$nopager=0; $etcmimetyp="/etc/mime.types"; $shrmimetyp="/usr/share/etc/mime.types"; $locmimetyp="/usr/local/etc/mime.types"; @@ -24,14 +27,6 @@ $quotedprct=chr(254); $retcode=0; -%patterntypes = -( - '(^|/)crontab[^/]+$' => 'text/x-crontab', #' - '/man\d*/' => 'application/x-troff-man', #' - '\.\d[^\.]*$' => 'application/x-troff-man', #' -); - - sub Usage { my($error) = @_; @@ -41,16 +36,16 @@ sub Usage { print STDERR "Options:\n"; print STDERR " actionspecify what action to do on these files (default=view)\n"; print STDERR " debug be verbose about what's going on\n"; -print STDERR " pager ignore any \"copiousoutput\" directives and use a \"pager\"\n"; +print STDERR " nopager ignore any \"copiousoutput\" directives and never use a \"pager\"\n"; print STDERR " norun just print but don't execute the command (useful with --debug)\n"; print STDERR "\n"; print STDERR "Mime-Type:\n"; print STDERR " any standard mime type designation in the form / -- if\n"; print STDERR " not specified, it will be determined from the filename extension\n\n"; print STDERR "Encoding:\n"; -print STDERR " how the file (and type) has been encoded (only \"gzip\", \"bzip\", \"bzip2\"\n"; -print STDERR " and \"compress\" are supported) -- if not specified, it will be determined\n"; -print STDERR " from the filename extension\n\n"; +print STDERR " how the file (and type) has been encoded (only \"gzip\", \"bzip2,\"\n"; +print STDERR " \"xz\" and \"compress\" are supported) -- if not specified, it will be\n"; +print STDERR " determined from the filename extension\n\n"; exit ($error ? 1 : 0); } @@ -62,8 +57,8 @@ sub EncodingForFile { my $encoding; if ($file =~ m/\.gz$/) { $encoding = "gzip"; } -if ($file =~ m/\.bz$/) { $encoding = "bzip"; } if ($file =~ m/\.bz2$/) { $encoding = "bzip2"; } +if ($file =~ m/\.xz$/) { $encoding = "xz"; } if ($file =~ m/\.Z$/) { $encoding = "compress"; } print STDERR " - file \"$file\" has encoding \"$encoding\"\n" if $debug && $encoding; @@ -76,10 +71,14 @@ sub EncodingForFile { sub ReadMimetypes { my($file) = @_; -return unless -r $file; - print
[packages/rpm-build-macros] avoid bogus commands caused by not escaped macro
commit eb651b4b94fd771d2d28080fd173ebfca2295efa Author: Tomasz PalaDate: Fri Mar 23 19:06:06 2018 +0100 avoid bogus commands caused by not escaped macro Run "/bin/systemctl restart if called after" to restart if called after. service_generator.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/service_generator.sh b/service_generator.sh index 7fa360b..210a32c 100755 --- a/service_generator.sh +++ b/service_generator.sh @@ -65,7 +65,7 @@ if [ "$check" = 1 ]; then if [ -f /var/lock/subsys/$service ]; then echo 'Run "/sbin/service $service restart" to restart $desc.' fi - elseNORESTART=1 # for %systemd_post if called after + elseNORESTART=1 # for %%systemd_post if called after fi EOF echo 'fi' gitweb: http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/eb651b4b94fd771d2d28080fd173ebfca2295efa ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: youtube-dl: youtube-dl-2018.02.11.tar.gz
Request by: gotar Files fetched: 1 STORED: http://youtube-dl.org/downloads/2018.02.11/youtube-dl-2018.02.11.tar.gz 55e41f307f5120f0b41dc504e210157c youtube-dl-2018.02.11.tar.gz Size: 2901130 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/youtube-dl] MD5 fixed
commit 553d8614fe40d161201a66b924b095b4b45e31ea Author: Tomasz PalaDate: Thu Feb 15 02:42:42 2018 +0100 MD5 fixed youtube-dl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/youtube-dl.spec b/youtube-dl.spec index 1761a29..d3ef7d1 100644 --- a/youtube-dl.spec +++ b/youtube-dl.spec @@ -16,7 +16,7 @@ Epoch:2 License: Public Domain Group: Applications/System Source0: http://youtube-dl.org/downloads/%{verlong}/%{name}-%{verlong}.tar.gz -# Source0-md5: 29263ee5ba281f3ef22e34f3157d800c +# Source0-md5: 55e41f307f5120f0b41dc504e210157c Source1: %{name}.conf # should be downloaded from: # https://github.com/rg3/youtube-dl/pull/10291.diff gitweb: http://git.pld-linux.org/gitweb.cgi/packages/youtube-dl.git/commitdiff/553d8614fe40d161201a66b924b095b4b45e31ea ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: youtube-dl: ERRORS: youtube-dl-2018.02.11.tar.gz
Request by: gotar FATAL: http://youtube-dl.org/downloads/2018.02.11/youtube-dl-2018.02.11.tar.gz md5 mismatch, needed 29263ee5ba281f3ef22e34f3157d800c, got 55e41f307f5120f0b41dc504e210157c 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/youtube-dl] upgraded to 2018.02.11
commit e011ebef8b5ab0bb8776944fd0edd424dad4de89 Author: Tomasz PalaDate: Thu Feb 15 02:36:16 2018 +0100 upgraded to 2018.02.11 youtube-dl.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/youtube-dl.spec b/youtube-dl.spec index 02c8bdf..1761a29 100644 --- a/youtube-dl.spec +++ b/youtube-dl.spec @@ -1,5 +1,5 @@ # full version number as seen on youtube-dl website -%defineverlong 2018.01.27 +%defineverlong 2018.02.11 # transform version so we don't have to bump epoch after four digit upgrades: # 2013.01.17.1 becomes 20130117_1 @@ -16,7 +16,7 @@ Epoch:2 License: Public Domain Group: Applications/System Source0: http://youtube-dl.org/downloads/%{verlong}/%{name}-%{verlong}.tar.gz -# Source0-md5: be5e9fd3de7906b5784f567bc2db8d48 +# Source0-md5: 29263ee5ba281f3ef22e34f3157d800c Source1: %{name}.conf # should be downloaded from: # https://github.com/rg3/youtube-dl/pull/10291.diff gitweb: http://git.pld-linux.org/gitweb.cgi/packages/youtube-dl.git/commitdiff/e011ebef8b5ab0bb8776944fd0edd424dad4de89 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: gdisk: gptfdisk-1.0.3.tar.gz
Request by: gotar Files fetched: 1 STORED: http://downloads.sourceforge.net/gptfdisk/gptfdisk-1.0.3.tar.gz 07b625a583b66c8c5840be5923f3e3fe gptfdisk-1.0.3.tar.gz Size: 199924 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/gdisk] upgraded to 1.0.3, packaged cgdisk
commit a848595055ff73d4f5234f495246caacaf1afb83 Author: Tomasz PalaDate: Tue Jan 9 13:24:28 2018 +0100 upgraded to 1.0.3, packaged cgdisk gdisk.spec | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) --- diff --git a/gdisk.spec b/gdisk.spec index 2475d98..6b46fa6 100644 --- a/gdisk.spec +++ b/gdisk.spec @@ -1,15 +1,15 @@ Summary: An fdisk-like partitioning tool for GPT disks Summary(pl.UTF-8): Podobne do fdiska narzędzie do partycjonowania dysków GPT Name: gdisk -Version: 0.8.7 -Release: 9 +Version: 1.0.3 +Release: 1 License: GPL v2 Group: Base Source0: http://downloads.sourceforge.net/gptfdisk/gptfdisk-%{version}.tar.gz -# Source0-md5: 005b45c0b37c37a99024704fdb2ee610 +# Source0-md5: 07b625a583b66c8c5840be5923f3e3fe Patch0:%{name}-link.patch URL: http://www.rodsbooks.com/gdisk/ -BuildRequires: libicu-devel +#BuildRequires:libicu-devel BuildRequires: libstdc++-devel BuildRequires: libuuid-devel BuildRequires: ncurses-devel @@ -32,28 +32,28 @@ formatu GPT. %prep %setup -q -n gptfdisk-%{version} -%patch0 -p1 +# since 0.8.9 libicu for UTF-16 support is optional +#%patch0 -p1 %build %{__make} \ CXX="%{__cxx}" \ - CXXFLAGS="%{rpmcxxflags} %{rpmcppflags} -D_FILE_OFFSET_BITS=64 -DUSE_UTF16 -I/usr/include/ncurses" + CXXFLAGS="%{rpmcxxflags} %{rpmcppflags} -D_FILE_OFFSET_BITS=64" %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8} -install -p gdisk sgdisk fixparts $RPM_BUILD_ROOT%{_sbindir} -cp -p gdisk.8 sgdisk.8 fixparts.8 $RPM_BUILD_ROOT%{_mandir}/man8 + +install fixparts *gdisk $RPM_BUILD_ROOT%{_sbindir} +install -p *.8 $RPM_BUILD_ROOT%{_mandir}/man8 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc README NEWS +%doc NEWS README *.html %attr(755,root,root) %{_sbindir}/fixparts -%attr(755,root,root) %{_sbindir}/gdisk -%attr(755,root,root) %{_sbindir}/sgdisk +%attr(755,root,root) %{_sbindir}/*gdisk %{_mandir}/man8/fixparts.8* -%{_mandir}/man8/gdisk.8* -%{_mandir}/man8/sgdisk.8* +%{_mandir}/man8/*gdisk.8* gitweb: http://git.pld-linux.org/gitweb.cgi/packages/gdisk.git/commitdiff/a848595055ff73d4f5234f495246caacaf1afb83 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/lesspipe] decode MPEG-TS, rel. 3; older highlight supported --out-format
commit 9863d295e83fbdb124fc3dfc5a93502ac20f3197 Author: Tomasz PalaDate: Tue Jan 2 11:47:28 2018 +0100 decode MPEG-TS, rel. 3; older highlight supported --out-format lesspipe.sh | 1 + lesspipe.spec | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) --- diff --git a/lesspipe.spec b/lesspipe.spec index f416873..22b2c40 100644 --- a/lesspipe.spec +++ b/lesspipe.spec @@ -6,7 +6,7 @@ Summary:Input preprocessor for less Summary(pl.UTF-8): Preprocesor wejścia dla narzędzia less Name: lesspipe Version: 1.57 -Release: 2 +Release: 3 License: GPL v2 Group: Applications/Text Source0: %{name}.sh @@ -17,7 +17,6 @@ Suggests: highlight >= 3.0 Suggests: mailcap >= 2.3 Suggests: objdump Suggests: openssl-tools -Conflicts: highlight < 3.0 Conflicts: less < 394-7.1 Conflicts: tar < 1:1.22 BuildArch: noarch diff --git a/lesspipe.sh b/lesspipe.sh index dbf5658..d60d932 100755 --- a/lesspipe.sh +++ b/lesspipe.sh @@ -127,6 +127,7 @@ lesspipe() { *.asc) command -v gpg >/dev/null && { gpg -nv --homedir=/dev/null "$1" || : ; } || gpg2 -nv --homedir=/dev/null "$1" ;; *.gpg) gpg -d "$1" ;; *.so) library_info "$1" ;; + *.ts) dvbsnoop -s ts -hideproginfo -nohexdumpbuffer -tssubdecode -n 1000 -if "$1";; # Possible manual pages *.1|*.2|*.3|*.4|*.5|*.6|*.7|*.8|*.9|*.l|*.n|*.man) FILE=$(file -L "$1") # groff src gitweb: http://git.pld-linux.org/gitweb.cgi/packages/lesspipe.git/commitdiff/9863d295e83fbdb124fc3dfc5a93502ac20f3197 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: openssl: ERRORS: openssl-1.0.2m.tar.gz openssl-1.0.2m-dev.tar.gz
Request by: gotar FATAL: https://github.com/openssl/openssl/archive/OpenSSL_1_0_2-stable/openssl-1.0.2m-dev.tar.gz md5 mismatch, needed 6b846f8a4f55f5ddfa1e0d335241840a, got f17a044a62b437058210a21613bf0afb Files fetched: 0 ALREADY GOT: https://www.openssl.org/source/openssl-1.0.2m.tar.gz 10e9e37f492094b9ef296f68f24a7666 openssl-1.0.2m.tar.gz -- 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] use the generic ca-bundle path instead of PLD-specific ca-certificates one
commit 618e7076669ee7a48416373d5da4369647c57246 Author: Tomasz PalaDate: Sun Dec 3 09:15:35 2017 +0100 use the generic ca-bundle path instead of PLD-specific ca-certificates one openssl-ca-certificates.patch | 2 +- openssl.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- diff --git a/openssl.spec b/openssl.spec index 8010668..dcaba4e 100644 --- a/openssl.spec +++ b/openssl.spec @@ -56,7 +56,7 @@ BuildRequires:rpm-perlprov >= 4.1-13 BuildRequires: rpmbuild(macros) >= 1.213 BuildRequires: sed >= 4.0 BuildRequires: zlib-devel -Requires: ca-certificates >= 20120623-1.1 +Requires: ca-certificates >= 20141019-3 Requires: rpm-whiteout >= 1.7 Obsoletes: SSLeay Obsoletes: SSLeay-devel diff --git a/openssl-ca-certificates.patch b/openssl-ca-certificates.patch index 8f366ad..0221ac2 100644 --- a/openssl-ca-certificates.patch +++ b/openssl-ca-certificates.patch @@ -6,7 +6,7 @@ diff -ruN openssl-1.0.2.orig/crypto/cryptlib.h openssl-1.0.2/crypto/cryptlib.h # define X509_CERT_AREA OPENSSLDIR # define X509_CERT_DIR OPENSSLDIR "/certs" -# define X509_CERT_FILE OPENSSLDIR "/cert.pem" -+# define X509_CERT_FILE "/etc/certs/ca-certificates.crt" ++# define X509_CERT_FILE "/etc/pki/tls/certs/ca-bundle.crt" # define X509_PRIVATE_DIROPENSSLDIR "/private" # else # define X509_CERT_AREA "SSLROOT:[00]" gitweb: http://git.pld-linux.org/gitweb.cgi/packages/openssl.git/commitdiff/618e7076669ee7a48416373d5da4369647c57246 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xpdf] the 4.00.01 version was actually only for binary distribution, printing should be explicitly enabled
commit c34454c14fd89b20a79a6193392324521756e54d Author: Tomasz PalaDate: Wed Nov 22 20:11:56 2017 +0100 the 4.00.01 version was actually only for binary distribution, printing should be explicitly enabled in cmake xpdf.spec | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) --- diff --git a/xpdf.spec b/xpdf.spec index 065db66..c39acd5 100644 --- a/xpdf.spec +++ b/xpdf.spec @@ -10,8 +10,8 @@ Summary(pt_BR.UTF-8): Visualizador de arquivos PDF Summary(ru.UTF-8): Программа для просмотра PDF файлов Summary(uk.UTF-8): Програма для перегляду PDF файлів Name: xpdf -Version: 4.01 -Release: 1 +Version: 4.00 +Release: 6 License: GPL v2+ Group: Applications/Publishing Source0: http://www.xpdfreader.com/dl/%{name}-%{version}.tar.gz @@ -107,7 +107,7 @@ pdffonts, pdfimages) i konwertowania ich do innych formatów (pdftopbm, pdftops, pdftotext). %prep -%setup -q -n %{name}-4.00 +%setup -q %{!?with_protections:%patch0 -p1} %patch1 -p1 %patch2 -p1 @@ -116,9 +116,10 @@ sed -e 's|DESTINATION man/|DESTINATION share/man/|g' -i xpdf{,-qt}/CMakeLists.tx %build %cmake . \ -DA4_PAPER=ON \ - -DSPLASH_CMYK=ON \ -DOPI_SUPPORT=ON \ + -DSPLASH_CMYK=ON \ -DSYSTEM_XPDFRC="%{_sysconfdir}/%{name}rc" \ + -DXPDFWIDGET_PRINTING=ON \ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=1 \ -DCMAKE_CXX_FLAGS="%{rpmcxxflags}" \ -DCMAKE_INSTALL_RPATH="%{_libexecdir}/%{name}" \ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xpdf.git/commitdiff/c34454c14fd89b20a79a6193392324521756e54d ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xpdf] upgraded to 4.01 (reenables printing), fixed system-wide xpdfrc location, separated libraries to res
commit 835ba18b82e58dd6889539ac39f6008c2129a3bd Author: Tomasz PalaDate: Wed Nov 22 19:52:07 2017 +0100 upgraded to 4.01 (reenables printing), fixed system-wide xpdfrc location, separated libraries to resolve conflict of xpdf (GUI) requiring xpdf-tools with poppler-progs xpdf.spec | 41 +++-- 1 file changed, 23 insertions(+), 18 deletions(-) --- diff --git a/xpdf.spec b/xpdf.spec index 352aa90..065db66 100644 --- a/xpdf.spec +++ b/xpdf.spec @@ -1,9 +1,3 @@ -# -# TODO: -# - separate subpackage with /etc/xpdfrc file; pdftotext -#from xpdf-tools or poppler-progs can use language -#support files but don't require entire xpdf -# # Conditional build: %bcond_withprotections # protections against fair use (printing and copying) %bcond_without x # X-based browser @@ -16,9 +10,9 @@ Summary(pt_BR.UTF-8): Visualizador de arquivos PDF Summary(ru.UTF-8): Программа для просмотра PDF файлов Summary(uk.UTF-8): Програма для перегляду PDF файлів Name: xpdf -Version: 4.00 -Release: 5 -License: GPL v2 or GPL v3 +Version: 4.01 +Release: 1 +License: GPL v2+ Group: Applications/Publishing Source0: http://www.xpdfreader.com/dl/%{name}-%{version}.tar.gz # Source0-md5: 80c8ce77acf1d36de93cecb82bd64a0f @@ -87,6 +81,14 @@ Xpdf - це програма для перегляду файлів в форм Format (PDF). Вона швидка й ефективна та використовує стандартні шрифти X Window. +%package common +Summary: Common xpdf files +Summary(pl.UTF-8): Wspólne pliki xpdf +Group: Applications/Publishing + +%description common +Private libraries used by xpdf GUI and CLI tools and xpdfrc file. + %package tools Summary: Set of tools for viewing information and converting PDF files Summary(pl.UTF-8): Zestaw narzędzi do wyświetlania informacji i konwertowania plików PDF @@ -105,7 +107,7 @@ pdffonts, pdfimages) i konwertowania ich do innych formatów (pdftopbm, pdftops, pdftotext). %prep -%setup -q +%setup -q -n %{name}-4.00 %{!?with_protections:%patch0 -p1} %patch1 -p1 %patch2 -p1 @@ -116,6 +118,7 @@ sed -e 's|DESTINATION man/|DESTINATION share/man/|g' -i xpdf{,-qt}/CMakeLists.tx -DA4_PAPER=ON \ -DSPLASH_CMYK=ON \ -DOPI_SUPPORT=ON \ + -DSYSTEM_XPDFRC="%{_sysconfdir}/%{name}rc" \ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=1 \ -DCMAKE_CXX_FLAGS="%{rpmcxxflags}" \ -DCMAKE_INSTALL_RPATH="%{_libexecdir}/%{name}" \ @@ -148,16 +151,20 @@ rm -rf $RPM_BUILD_ROOT %if %{with x} %files %defattr(644,root,root,755) -%doc ANNOUNCE CHANGES README %attr(755,root,root) %{_bindir}/xpdf -%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/xpdfrc -%{_datadir}/xpdf +%{_desktopdir}/%{name}.desktop +%{_pixmapsdir}/%{name}.png %{_mandir}/man1/xpdf.1* -%{_mandir}/man5/xpdfrc.5* -%{_desktopdir}/xpdf.desktop -%{_pixmapsdir}/xpdf.png %endif +%files common +%doc ANNOUNCE CHANGES README +%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/%{name}rc +%dir %{_libexecdir}/%{name} +%attr(755,root,root) %{_libexecdir}/%{name}/lib*.so +%{_datadir}/xpdf +%{_mandir}/man5/xpdfrc.5* + %files tools %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/pdfdetach @@ -169,8 +176,6 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/pdftoppm %attr(755,root,root) %{_bindir}/pdftops %attr(755,root,root) %{_bindir}/pdftotext -%dir %{_libexecdir}/%{name} -%attr(755,root,root) %{_libexecdir}/%{name}/lib*.so %{_mandir}/man1/pdfdetach.1* %{_mandir}/man1/pdffonts.1* %{_mandir}/man1/pdfimages.1* gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xpdf.git/commitdiff/835ba18b82e58dd6889539ac39f6008c2129a3bd ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: xpdf: xpdf-4.01.tar.gz
Request by: gotar Files fetched: 1 STORED: http://www.xpdfreader.com/dl/xpdf-4.01.tar.gz 80c8ce77acf1d36de93cecb82bd64a0f xpdf-4.01.tar.gz Size: 854175 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/xpdf] own /usr/libexec/xpdf
commit bad3f6264e7c59f27f1b59524cae4382e57e693d Author: Tomasz PalaDate: Sun Nov 19 13:35:55 2017 +0100 own /usr/libexec/xpdf xpdf.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- diff --git a/xpdf.spec b/xpdf.spec index 7d3f2c0..352aa90 100644 --- a/xpdf.spec +++ b/xpdf.spec @@ -17,7 +17,7 @@ Summary(ru.UTF-8):Программа для просмотра PDF файлов Summary(uk.UTF-8): Програма для перегляду PDF файлів Name: xpdf Version: 4.00 -Release: 4 +Release: 5 License: GPL v2 or GPL v3 Group: Applications/Publishing Source0: http://www.xpdfreader.com/dl/%{name}-%{version}.tar.gz @@ -169,6 +169,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/pdftoppm %attr(755,root,root) %{_bindir}/pdftops %attr(755,root,root) %{_bindir}/pdftotext +%dir %{_libexecdir}/%{name} %attr(755,root,root) %{_libexecdir}/%{name}/lib*.so %{_mandir}/man1/pdfdetach.1* %{_mandir}/man1/pdffonts.1* gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xpdf.git/commitdiff/bad3f6264e7c59f27f1b59524cae4382e57e693d ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xpdf] package private libraries used by tools, use them by main binary too
commit 423447612d053a4d8e983dfceabd1ea70193a467 Author: Tomasz PalaDate: Sun Nov 19 13:25:31 2017 +0100 package private libraries used by tools, use them by main binary too dynamic_private.patch | 20 xpdf.spec | 10 -- 2 files changed, 28 insertions(+), 2 deletions(-) --- diff --git a/xpdf.spec b/xpdf.spec index 95b72fe..7d3f2c0 100644 --- a/xpdf.spec +++ b/xpdf.spec @@ -17,7 +17,7 @@ Summary(ru.UTF-8):Программа для просмотра PDF файлов Summary(uk.UTF-8): Програма для перегляду PDF файлів Name: xpdf Version: 4.00 -Release: 3 +Release: 4 License: GPL v2 or GPL v3 Group: Applications/Publishing Source0: http://www.xpdfreader.com/dl/%{name}-%{version}.tar.gz @@ -27,6 +27,7 @@ Source2: %{name}.png Source3: %{name}rc Patch0:%{name}-remove_protections.patch Patch1:%{name}-fontdirs.patch +Patch2:dynamic_private.patch URL: http://www.xpdfreader.com/ BuildRequires: cmake >= 2.8.8 BuildRequires: freetype-devel >= 2.1.0 @@ -107,6 +108,7 @@ pdftops, pdftotext). %setup -q %{!?with_protections:%patch0 -p1} %patch1 -p1 +%patch2 -p1 sed -e 's|DESTINATION man/|DESTINATION share/man/|g' -i xpdf{,-qt}/CMakeLists.txt %build @@ -116,17 +118,20 @@ sed -e 's|DESTINATION man/|DESTINATION share/man/|g' -i xpdf{,-qt}/CMakeLists.tx -DOPI_SUPPORT=ON \ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=1 \ -DCMAKE_CXX_FLAGS="%{rpmcxxflags}" \ + -DCMAKE_INSTALL_RPATH="%{_libexecdir}/%{name}" \ -DCMAKE_EXE_LINKER_FLAGS="-lpaper %{rpmldflags}" %{__make} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_desktopdir},%{_pixmapsdir},%{_datadir}/xpdf} +install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_desktopdir},%{_pixmapsdir},{%{_datadir},%{_libexecdir}}/%{name}} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +install {fofi/libfofi,goo/libgoo,splash/libsplash}.so $RPM_BUILD_ROOT%{_libexecdir}/%{name} + cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir} cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir} @@ -164,6 +169,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/pdftoppm %attr(755,root,root) %{_bindir}/pdftops %attr(755,root,root) %{_bindir}/pdftotext +%attr(755,root,root) %{_libexecdir}/%{name}/lib*.so %{_mandir}/man1/pdfdetach.1* %{_mandir}/man1/pdffonts.1* %{_mandir}/man1/pdfimages.1* diff --git a/dynamic_private.patch b/dynamic_private.patch new file mode 100644 index 000..b59ad92 --- /dev/null +++ b/dynamic_private.patch @@ -0,0 +1,20 @@ +--- a/xpdf-qt/CMakeLists.txt.orig 2017-08-09 01:22:50.0 +0200 b/xpdf-qt/CMakeLists.txt 2017-11-19 12:38:14.0 +0100 +@@ -63,9 +63,6 @@ + endif () + + add_executable(xpdf +-$ +-$ +-$ + $ + $ + ${XPDFWIDGET_PRINT_MODULES} +@@ -81,6 +78,7 @@ + ${XPDF_ICONS} + ) + target_link_libraries(xpdf ${QT_LIBRARIES} ${EXTRA_QT_LIBRARIES} ++ goo fofi splash + ${FREETYPE_LIBRARY} ${FREETYPE_OTHER_LIBS} + ${DTYPE_LIBRARY} ${LCMS_LIBRARY} + ${CMAKE_THREAD_LIBS_INIT}) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xpdf.git/commitdiff/423447612d053a4d8e983dfceabd1ea70193a467 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/rpm] use libexec directory for private binaries - optional since FHS 3.0
commit affe917daa01f2d0aab93a5aa7d76da16a854f53 Author: Tomasz PalaDate: Sun Nov 19 12:57:51 2017 +0100 use libexec directory for private binaries - optional since FHS 3.0 As discussed before, it's time to stop hacking package build systems and start doing some cleanups gradually. http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2017-July/025378.html http://lists.pld-linux.org/mailman/pipermail/pld-devel-pl/2017-June/157370.html macros.pld.in | 2 +- rpm.spec | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) --- diff --git a/rpm.spec b/rpm.spec index 92c711d..ac613f1 100644 --- a/rpm.spec +++ b/rpm.spec @@ -47,7 +47,7 @@ Summary(ru.UTF-8):Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 5.4.15 -Release: 40 +Release: 41 License: LGPL v2.1 Group: Base # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm @@ -362,6 +362,7 @@ BuildRequires: popt-static >= %{reqpopt_ver} BuildRequires: zlib-static %endif Requires(posttrans): coreutils +Requires: FHS >= 3.0-2 Requires: %{name}-base = %{version}-%{release} Requires: %{name}-lib = %{version}-%{release} Requires: beecrypt >= %{beecrypt_ver} diff --git a/macros.pld.in b/macros.pld.in index de2f125..326b00b 100644 --- a/macros.pld.in +++ b/macros.pld.in @@ -25,7 +25,7 @@ %_exec_prefix %{_prefix} %_bindir %{_exec_prefix}/bin %_sbindir %{_exec_prefix}/sbin -%_libexecdir %{_exec_prefix}/%{_lib} +%_libexecdir %{_exec_prefix}/libexec %_datadir %{_prefix}/share %_sysconfdir %{_prefix}/etc %_sharedstatedir /var/lib gitweb: http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/affe917daa01f2d0aab93a5aa7d76da16a854f53 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xpdf] build with Qt4 until Qt5 is fixed to work via forwarded X11
commit 62eb63a564bdfbb46613985d08eab902a3c61f77 Author: Tomasz PalaDate: Mon Nov 6 10:34:06 2017 +0100 build with Qt4 until Qt5 is fixed to work via forwarded X11 Qt5 introduced tremendous increase in bandwidth usage for forwarded X11. Moreover, 5.7+ segfaults, which is probably fixed in 5.9. Currently: QT_QPA_PLATFORM=eglfs == unusable QT_QPA_PLATFORM=minimalegl == segfauls QT_QPA_PLATFORM=xcb QT_XCB_GL_INTEGRATION=none == nothing happens... LIBGL_DEBUG=1 EGL_LOG_LEVEL=debug QT_LOGGING_RULES=qt.qpa.*=true xpdf.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- diff --git a/xpdf.spec b/xpdf.spec index 5e3baac..420cec8 100644 --- a/xpdf.spec +++ b/xpdf.spec @@ -17,7 +17,7 @@ Summary(ru.UTF-8):Программа для просмотра PDF файлов Summary(uk.UTF-8): Програма для перегляду PDF файлів Name: xpdf Version: 4.00 -Release: 1 +Release: 2 License: GPL v2 or GPL v3 Group: Applications/Publishing Source0: http://www.xpdfreader.com/dl/%{name}-%{version}.tar.gz @@ -114,6 +114,7 @@ sed -e 's|DESTINATION man/|DESTINATION share/man/|g' -i xpdf{,-qt}/CMakeLists.tx -DA4_PAPER=ON \ -DSPLASH_CMYK=ON \ -DOPI_SUPPORT=ON \ + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=1 \ -DCMAKE_CXX_FLAGS="%{rpmcxxflags}" \ -DCMAKE_EXE_LINKER_FLAGS="-lpaper %{rpmldflags}" gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xpdf.git/commitdiff/62eb63a564bdfbb46613985d08eab902a3c61f77 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xpdf] upgraded to 4.00
commit e24bfd154bff0bac875633e31651365dc1e1aa95 Author: Tomasz PalaDate: Sun Nov 5 23:22:13 2017 +0100 upgraded to 4.00 xpdf-install.patch| 26 -- xpdf-remove_protections.patch | 181 -- xpdf.spec | 40 +- 3 files changed, 68 insertions(+), 179 deletions(-) --- diff --git a/xpdf.spec b/xpdf.spec index 12e7fb5..5e3baac 100644 --- a/xpdf.spec +++ b/xpdf.spec @@ -16,29 +16,27 @@ Summary(pt_BR.UTF-8): Visualizador de arquivos PDF Summary(ru.UTF-8): Программа для просмотра PDF файлов Summary(uk.UTF-8): Програма для перегляду PDF файлів Name: xpdf -Version: 3.04 -Release: 2 +Version: 4.00 +Release: 1 License: GPL v2 or GPL v3 Group: Applications/Publishing -Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}-%{version}.tar.gz -# Source0-md5: 3bc86c69c8ff444db52461270bef3f44 +Source0: http://www.xpdfreader.com/dl/%{name}-%{version}.tar.gz +# Source0-md5: 80c8ce77acf1d36de93cecb82bd64a0f Source1: %{name}.desktop Source2: %{name}.png Source3: %{name}rc Patch0:%{name}-remove_protections.patch Patch1:%{name}-fontdirs.patch -Patch2:%{name}-install.patch -URL: http://www.foolabs.com/xpdf/ -BuildRequires: autoconf >= 2.57 +URL: http://www.xpdfreader.com/ +BuildRequires: cmake >= 2.8.8 BuildRequires: freetype-devel >= 2.1.0 BuildRequires: libpaper-devel BuildRequires: libpng-devel BuildRequires: libstdc++-devel -%{?with_x:BuildRequires: motif-devel >= 2.2} +%{?with_x:BuildRequires: QtCore-devel} +%{?with_x:BuildRequires: QtGui-devel} +%{?with_x:BuildRequires: qt4-qmake} BuildRequires: rpmbuild(macros) >= 1.596 -%{?with_x:BuildRequires: xorg-lib-libX11-devel} -%{?with_x:BuildRequires: xorg-lib-libXpm-devel} -%{?with_x:BuildRequires: xorg-lib-libXt-devel} Requires: desktop-file-utils Suggests: ghostscript-fonts-std BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -109,24 +107,22 @@ pdftops, pdftotext). %setup -q %{!?with_protections:%patch0 -p1} %patch1 -p1 -%patch2 -p1 +sed -e 's|DESTINATION man/|DESTINATION share/man/|g' -i xpdf{,-qt}/CMakeLists.txt %build -%{__autoconf} -%{!?with_x:export no_x=yes} -CXXFLAGS="%{rpmcflags} -fno-exceptions -fno-rtti" -%configure \ - --enable-a4-paper \ - --enable-cmyk \ - --enable-multithreaded \ - --enable-opi \ - --with-freetype2-includes=/usr/include/freetype2 +%cmake . \ + -DA4_PAPER=ON \ + -DSPLASH_CMYK=ON \ + -DOPI_SUPPORT=ON \ + -DCMAKE_CXX_FLAGS="%{rpmcxxflags}" \ + -DCMAKE_EXE_LINKER_FLAGS="-lpaper %{rpmldflags}" %{__make} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_datadir}/xpdf} +install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_desktopdir},%{_pixmapsdir},%{_datadir}/xpdf} + %{__make} install \ DESTDIR=$RPM_BUILD_ROOT diff --git a/xpdf-install.patch b/xpdf-install.patch deleted file mode 100644 index 6dd46d6..000 --- a/xpdf-install.patch +++ /dev/null @@ -1,26 +0,0 @@ xpdf-3.04/Makefile.in.orig 2014-05-28 20:50:50.0 +0200 -+++ xpdf-3.04/Makefile.in 2014-06-16 18:42:11.004550995 +0200 -@@ -86,19 +86,23 @@ - @X@ $(INSTALL_PROGRAM) xpdf/xpdf$(EXE) $(DESTDIR)@bindir@/xpdf$(EXE) - $(INSTALL_PROGRAM) xpdf/pdftops$(EXE) $(DESTDIR)@bindir@/pdftops$(EXE) - $(INSTALL_PROGRAM) xpdf/pdftotext$(EXE) $(DESTDIR)@bindir@/pdftotext$(EXE) -+ $(INSTALL_PROGRAM) xpdf/pdftohtml$(EXE) $(DESTDIR)@bindir@/pdftohtml$(EXE) - $(INSTALL_PROGRAM) xpdf/pdfinfo$(EXE) $(DESTDIR)@bindir@/pdfinfo$(EXE) - $(INSTALL_PROGRAM) xpdf/pdffonts$(EXE) $(DESTDIR)@bindir@/pdffonts$(EXE) - $(INSTALL_PROGRAM) xpdf/pdfdetach$(EXE) $(DESTDIR)@bindir@/pdfdetach$(EXE) - @X@ $(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(EXE) -+@X@ $(INSTALL_PROGRAM) xpdf/pdftopng$(EXE) $(DESTDIR)@bindir@/pdftopng$(EXE) - $(INSTALL_PROGRAM) xpdf/pdfimages$(EXE) $(DESTDIR)@bindir@/pdfimages$(EXE) - -mkdir -p $(DESTDIR)@mandir@/man1 - @X@ $(INSTALL_DATA) $(srcdir)/doc/xpdf.1 $(DESTDIR)@mandir@/man1/xpdf.1 - $(INSTALL_DATA) $(srcdir)/doc/pdftops.1 $(DESTDIR)@mandir@/man1/pdftops.1 - $(INSTALL_DATA) $(srcdir)/doc/pdftotext.1 $(DESTDIR)@mandir@/man1/pdftotext.1 -+ $(INSTALL_DATA) $(srcdir)/doc/pdftohtml.1 $(DESTDIR)@mandir@/man1/pdftohtml.1 - $(INSTALL_DATA) $(srcdir)/doc/pdfinfo.1 $(DESTDIR)@mandir@/man1/pdfinfo.1 - $(INSTALL_DATA) $(srcdir)/doc/pdffonts.1 $(DESTDIR)@mandir@/man1/pdffonts.1 - $(INSTALL_DATA) $(srcdir)/doc/pdfdetach.1 $(DESTDIR)@mandir@/man1/pdfdetach.1 - @X@ $(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdftoppm.1 -+@X@ $(INSTALL_DATA) $(srcdir)/doc/pdftopng.1
DISTFILES: xpdf: xpdf-4.00.tar.gz
Request by: gotar Files fetched: 1 STORED: http://www.xpdfreader.com/dl/xpdf-4.00.tar.gz 80c8ce77acf1d36de93cecb82bd64a0f xpdf-4.00.tar.gz Size: 854175 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/libpng] chasing new symbols undefined reference to `inflateValidate@ZLIB_1.2.9'
commit ae0ffb24c5aa57416dc5848e7bb64b3bba7fe0bd Author: Tomasz PalaDate: Sun Nov 5 20:43:30 2017 +0100 chasing new symbols undefined reference to `inflateValidate@ZLIB_1.2.9' libpng.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/libpng.spec b/libpng.spec index 3d6e414..3bcf491 100644 --- a/libpng.spec +++ b/libpng.spec @@ -27,7 +27,7 @@ URL: http://www.libpng.org/pub/png/libpng.html BuildRequires: rpmbuild(macros) >= 1.213 BuildRequires: tar >= 1:1.22 BuildRequires: xz >= 1:4.999.7 -BuildRequires: zlib-devel +BuildRequires: zlib-devel >= 1.2.9 Provides: libpng(APNG) = 0.10 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/libpng.git/commitdiff/ae0ffb24c5aa57416dc5848e7bb64b3bba7fe0bd ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/libcli] upgraded to 1.9.7
commit 06779bae6946655e8ead5148ce4860f96658c325 Author: Tomasz PalaDate: Sun Nov 5 18:26:07 2017 +0100 upgraded to 1.9.7 libcli.spec | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) --- diff --git a/libcli.spec b/libcli.spec index bfa7a35..d0bd327 100644 --- a/libcli.spec +++ b/libcli.spec @@ -1,13 +1,13 @@ Summary: Cisco-like telnet command-line library Summary(pl.UTF-8): Biblioteka Cisco-podobnej linii poleceń telnetu Name: libcli -Version: 1.9.4 +Version: 1.9.7 Release: 1 -License: LGPL -Group: Applications/Networking -Source0: http://libcli.googlecode.com/files/%{name}-%{version}.tar.gz -# Source0-md5: b917617d21b90db214971efe64a33416 -URL: http://code.google.com/p/libcli/ +License: LGPL v2.1 +Group: Libraries +Source0: https://github.com/dparrish/libcli/archive/v%{version}.tar.gz +# Source0-md5: f33e0fdb8ae8e14e66036424704b201b +URL: https://github.com/dparrish/libcli BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description gitweb: http://git.pld-linux.org/gitweb.cgi/packages/libcli.git/commitdiff/06779bae6946655e8ead5148ce4860f96658c325 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: libcli: v1.9.7.tar.gz
Request by: gotar Files fetched: 1 STORED: https://github.com/dparrish/libcli/archive/v1.9.7.tar.gz f33e0fdb8ae8e14e66036424704b201b v1.9.7.tar.gz Size: 29557 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/netsniff-ng] %doc typo
commit 1179d3347a8a263735aa6a92a608a4f99aba3b1c Author: Tomasz PalaDate: Sun Nov 5 18:09:47 2017 +0100 %doc typo netsniff-ng.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/netsniff-ng.spec b/netsniff-ng.spec index 7592158..41eee90 100644 --- a/netsniff-ng.spec +++ b/netsniff-ng.spec @@ -64,7 +64,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc AUTHORS README REPORTING-BUGS bpf_jit_disasm bpf.vim +%doc AUTHORS README REPORTING-BUGS bpf_jit_disasm.c bpf.vim %dir %{_sysconfdir}/%{name} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/* %attr(755,root,root) %{_sbindir}/* gitweb: http://git.pld-linux.org/gitweb.cgi/packages/netsniff-ng.git/commitdiff/1179d3347a8a263735aa6a92a608a4f99aba3b1c ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/netsniff-ng] for syntax fixed
commit 447758fc9c5e340e5087ee640838a00288dd89c7 Author: Tomasz PalaDate: Sun Nov 5 18:07:12 2017 +0100 for syntax fixed netsniff-ng.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/netsniff-ng.spec b/netsniff-ng.spec index 998e5f4..7592158 100644 --- a/netsniff-ng.spec +++ b/netsniff-ng.spec @@ -55,7 +55,7 @@ install -d $RPM_BUILD_ROOT{%{_sbindir},%{zsh_compdir}} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -for i in *.zsh +for i in *.zsh; do install -p "$i" $RPM_BUILD_ROOT%{zsh_compdir}/_"${i%.zsh}" done gitweb: http://git.pld-linux.org/gitweb.cgi/packages/netsniff-ng.git/commitdiff/447758fc9c5e340e5087ee640838a00288dd89c7 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/netsniff-ng] fix compilation using newer gcc
commit 11e5887480e5ed7fc43c8310699912a1052cc8a4 Author: Tomasz PalaDate: Sun Nov 5 18:04:38 2017 +0100 fix compilation using newer gcc netsniff-ng.spec | 1 + 1 file changed, 1 insertion(+) --- diff --git a/netsniff-ng.spec b/netsniff-ng.spec index e483312..998e5f4 100644 --- a/netsniff-ng.spec +++ b/netsniff-ng.spec @@ -35,6 +35,7 @@ BuildRoot:%{tmpdir}/%{name}-%{version}-root-%(id -u -n) %prep %setup -q +%{__sed} -e '43i#include ' -i staging/mz.h %build NACL_INC_DIR=$(pkg-config --variable=includedir libsodium )/sodium \ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/netsniff-ng.git/commitdiff/11e5887480e5ed7fc43c8310699912a1052cc8a4 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/netsniff-ng] one more try, with no hardening at all
commit a8a34706759d845885525fe9d1e2f5b2d9e01576 Author: Tomasz PalaDate: Sun Nov 5 17:50:44 2017 +0100 one more try, with no hardening at all netsniff-ng.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/netsniff-ng.spec b/netsniff-ng.spec index 477c73b..e483312 100644 --- a/netsniff-ng.spec +++ b/netsniff-ng.spec @@ -44,8 +44,8 @@ NACL_LIB=sodium \ --prefix="%{_prefix}" %{__make} \ %{?debug:DEBUG=1} \ - %{!?debug:HARDENING=1} \ Q= +# %{!?debug:HARDENING=1 CPPFLAGS="%{rpmcflags}"} \ %install rm -rf $RPM_BUILD_ROOT gitweb: http://git.pld-linux.org/gitweb.cgi/packages/netsniff-ng.git/commitdiff/a8a34706759d845885525fe9d1e2f5b2d9e01576 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/netsniff-ng] try without our CFLAGS
commit 56a9b9288e34927ce7c425a6b6de4408086dbe0a Author: Tomasz PalaDate: Sun Nov 5 17:48:10 2017 +0100 try without our CFLAGS netsniff-ng.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/netsniff-ng.spec b/netsniff-ng.spec index 4a6b207..477c73b 100644 --- a/netsniff-ng.spec +++ b/netsniff-ng.spec @@ -42,9 +42,9 @@ NACL_LIB=sodium \ ./configure \ --sysconfdir="%{_sysconfdir}" \ --prefix="%{_prefix}" -%{__make} -j1 \ +%{__make} \ %{?debug:DEBUG=1} \ - %{!?debug:HARDENING=1 CPPFLAGS="%{rpmcflags}"} \ + %{!?debug:HARDENING=1} \ Q= %install gitweb: http://git.pld-linux.org/gitweb.cgi/packages/netsniff-ng.git/commitdiff/56a9b9288e34927ce7c425a6b6de4408086dbe0a ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/netsniff-ng] not sure what breaks the build here...
commit 238ebfa13782e325294dae8255ce736938d4e613 Author: Tomasz PalaDate: Sun Nov 5 17:42:04 2017 +0100 not sure what breaks the build here... netsniff-ng.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/netsniff-ng.spec b/netsniff-ng.spec index a1dcbf6..4a6b207 100644 --- a/netsniff-ng.spec +++ b/netsniff-ng.spec @@ -42,9 +42,9 @@ NACL_LIB=sodium \ ./configure \ --sysconfdir="%{_sysconfdir}" \ --prefix="%{_prefix}" -%{__make} \ +%{__make} -j1 \ %{?debug:DEBUG=1} \ - %{!?debug:HARDENING=0 CPPFLAGS="%{rpmcflags}"} \ + %{!?debug:HARDENING=1 CPPFLAGS="%{rpmcflags}"} \ Q= %install gitweb: http://git.pld-linux.org/gitweb.cgi/packages/netsniff-ng.git/commitdiff/238ebfa13782e325294dae8255ce736938d4e613 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/netsniff-ng] disable HARDENING flags trying to mitigate build error, rely on what we have
commit 0a2cbaeeb0bd353d2ec6788d9a3ef1774dfb932c Author: Tomasz PalaDate: Sun Nov 5 17:40:13 2017 +0100 disable HARDENING flags trying to mitigate build error, rely on what we have netsniff-ng.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/netsniff-ng.spec b/netsniff-ng.spec index d91ab61..a1dcbf6 100644 --- a/netsniff-ng.spec +++ b/netsniff-ng.spec @@ -44,7 +44,7 @@ NACL_LIB=sodium \ --prefix="%{_prefix}" %{__make} \ %{?debug:DEBUG=1} \ - %{!?debug:HARDENING=1 CPPFLAGS="%{rpmcflags}"} \ + %{!?debug:HARDENING=0 CPPFLAGS="%{rpmcflags}"} \ Q= %install gitweb: http://git.pld-linux.org/gitweb.cgi/packages/netsniff-ng.git/commitdiff/0a2cbaeeb0bd353d2ec6788d9a3ef1774dfb932c ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/zsh] top directory /usr/share/zsh also moved to filesystem
commit 7e9aa3958bb103f541a99aa552df20e220d60a41 Author: Tomasz PalaDate: Sun Nov 5 17:29:14 2017 +0100 top directory /usr/share/zsh also moved to filesystem zsh.spec | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) --- diff --git a/zsh.spec b/zsh.spec index abf76c7..70a1957 100644 --- a/zsh.spec +++ b/zsh.spec @@ -16,7 +16,7 @@ Summary(tr.UTF-8):Gelişmiş bir BASH sürümü Summary(uk.UTF-8): Командний процесор (shell) схожий на ksh, але з покращеннями Name: zsh Version: 5.4.2 -Release: 2 +Release: 3 License: BSD-like Group: Applications/Shells Source0: http://downloads.sourceforge.net/zsh/%{name}-%{version}.tar.xz @@ -280,7 +280,6 @@ fi %attr(755,root,root) %{_bindir}/zsh %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/*[!w]? %ghost %{_sysconfdir}/z*.zwc -%dir %{_datadir}/zsh %dir %{_datadir}/zsh/%{version}* %dir %{_datadir}/zsh/%{version}*/functions %{_datadir}/zsh/%{version}*/functions/[!_c]* @@ -289,8 +288,6 @@ fi %{_datadir}/zsh/%{version}*/help %{_datadir}/zsh/%{version}*/scripts %{_datadir}/zsh/latest -# moved to filesystem.spec, left here with this comment to make sure is is not populated by this package -#%{_datadir}/zsh/site-functions %dir %{_libdir}/zsh %dir %{_libdir}/zsh/%{version}* %attr(755,root,root) %{_libdir}/zsh/%{version}*/* gitweb: http://git.pld-linux.org/gitweb.cgi/packages/zsh.git/commitdiff/7e9aa3958bb103f541a99aa552df20e220d60a41 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/filesystem] oops, must carry containing directory as well
commit b559e3ed0de3ae1f61f0641cf741be3cf8f075a5 Author: Tomasz PalaDate: Sun Nov 5 17:25:36 2017 +0100 oops, must carry containing directory as well filesystem.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- diff --git a/filesystem.spec b/filesystem.spec index 16e4708..d9fdcb3 100644 --- a/filesystem.spec +++ b/filesystem.spec @@ -6,7 +6,7 @@ Summary:Common directories Summary(pl.UTF-8): Wspólne katalogi Name: filesystem Version: 4.1 -Release: 5 +Release: 6 License: GPL Group: Base BuildRequires: automake @@ -271,6 +271,7 @@ posix.chown("/etc/cron.d", 0, %{gid_crontab}) %dir /usr/share/xdg-desktop-portal %dir /usr/share/xdg-desktop-portal/portals %dir /usr/share/xsessions +%dir /usr/share/zsh %dir /usr/share/zsh/site-functions %dir /usr/src/examples %attr(700,root,root) %dir /var/lock/subsys gitweb: http://git.pld-linux.org/gitweb.cgi/packages/filesystem.git/commitdiff/b559e3ed0de3ae1f61f0641cf741be3cf8f075a5 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/netsniff-ng] don't alter other ./configure options
commit 211ed9e0373fdab49fd34a2ec3a19fcdc47f52e3 Author: Tomasz PalaDate: Sun Nov 5 17:21:09 2017 +0100 don't alter other ./configure options netsniff-ng.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/netsniff-ng.spec b/netsniff-ng.spec index e9eca3e..d91ab61 100644 --- a/netsniff-ng.spec +++ b/netsniff-ng.spec @@ -39,7 +39,7 @@ BuildRoot:%{tmpdir}/%{name}-%{version}-root-%(id -u -n) %build NACL_INC_DIR=$(pkg-config --variable=includedir libsodium )/sodium \ NACL_LIB=sodium \ -%configure \ +./configure \ --sysconfdir="%{_sysconfdir}" \ --prefix="%{_prefix}" %{__make} \ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/netsniff-ng.git/commitdiff/211ed9e0373fdab49fd34a2ec3a19fcdc47f52e3 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/zsh] site-local completion directory moved to filesystem.spec
commit 7d31844df3e97795e78718c1f2259b59c5b67fd2 Author: Tomasz PalaDate: Sun Nov 5 17:07:20 2017 +0100 site-local completion directory moved to filesystem.spec zsh.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- diff --git a/zsh.spec b/zsh.spec index 3b60dba..abf76c7 100644 --- a/zsh.spec +++ b/zsh.spec @@ -16,7 +16,7 @@ Summary(tr.UTF-8):Gelişmiş bir BASH sürümü Summary(uk.UTF-8): Командний процесор (shell) схожий на ksh, але з покращеннями Name: zsh Version: 5.4.2 -Release: 1 +Release: 2 License: BSD-like Group: Applications/Shells Source0: http://downloads.sourceforge.net/zsh/%{name}-%{version}.tar.xz @@ -289,7 +289,8 @@ fi %{_datadir}/zsh/%{version}*/help %{_datadir}/zsh/%{version}*/scripts %{_datadir}/zsh/latest -%{_datadir}/zsh/site-functions +# moved to filesystem.spec, left here with this comment to make sure is is not populated by this package +#%{_datadir}/zsh/site-functions %dir %{_libdir}/zsh %dir %{_libdir}/zsh/%{version}* %attr(755,root,root) %{_libdir}/zsh/%{version}*/* gitweb: http://git.pld-linux.org/gitweb.cgi/packages/zsh.git/commitdiff/7d31844df3e97795e78718c1f2259b59c5b67fd2 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/filesystem] provide ZSH completion directory, stop the one-file subpackages madness
commit 794a1a3ae290accafbbd5673a0c9018f031253a5 Author: Tomasz PalaDate: Sun Nov 5 17:00:56 2017 +0100 provide ZSH completion directory, stop the one-file subpackages madness filesystem.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- diff --git a/filesystem.spec b/filesystem.spec index a19c941..16e4708 100644 --- a/filesystem.spec +++ b/filesystem.spec @@ -6,7 +6,7 @@ Summary:Common directories Summary(pl.UTF-8): Wspólne katalogi Name: filesystem Version: 4.1 -Release: 4 +Release: 5 License: GPL Group: Base BuildRequires: automake @@ -84,7 +84,7 @@ install -d \ $RPM_BUILD_ROOT/lib/{firmware,security,udev/{hwdb.d,rules.d},systemd/system} \ $RPM_BUILD_ROOT/usr/include/{security,X11} \ $RPM_BUILD_ROOT/usr/lib/{ConsoleKit/run-session.d,browser-plugins,cgi-bin,cmake,mozilla/extensions,pkcs11,pkgconfig,initrd,tmpfiles.d,binfmt.d} \ - $RPM_BUILD_ROOT/usr/share/{appdata,augeas/lenses/tests,backgrounds,cmake/Modules,defaults,factory/etc/pam.d,fontconfig/conf.avail,gnome/help,mate/help,man/man{n,l},man/pl/mann,metainfo,pkgconfig,soundfonts,sounds,themes/Default,thumbnailers,vala/vapi,wallpapers,wayland-sessions,xdg-desktop-portal/portals,xsessions} \ + $RPM_BUILD_ROOT/usr/share/{appdata,augeas/lenses/tests,backgrounds,cmake/Modules,defaults,factory/etc/pam.d,fontconfig/conf.avail,gnome/help,mate/help,man/man{n,l},man/pl/mann,metainfo,pkgconfig,soundfonts,sounds,themes/Default,thumbnailers,vala/vapi,wallpapers,wayland-sessions,xdg-desktop-portal/portals,xsessions,zsh/site-functions} \ $RPM_BUILD_ROOT/usr/src/examples \ $RPM_BUILD_ROOT/var/lock/subsys \ $RPM_BUILD_ROOT/var/log/archive \ @@ -271,6 +271,7 @@ posix.chown("/etc/cron.d", 0, %{gid_crontab}) %dir /usr/share/xdg-desktop-portal %dir /usr/share/xdg-desktop-portal/portals %dir /usr/share/xsessions +%dir /usr/share/zsh/site-functions %dir /usr/src/examples %attr(700,root,root) %dir /var/lock/subsys %attr(751,root,root) %dir /var/log/archive gitweb: http://git.pld-linux.org/gitweb.cgi/packages/filesystem.git/commitdiff/794a1a3ae290accafbbd5673a0c9018f031253a5 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/netsniff-ng] zsh install directory fixed
commit c50717c33ce57a2be4fc6eeea931abb8363d95a4 Author: Tomasz PalaDate: Sun Nov 5 16:54:23 2017 +0100 zsh install directory fixed netsniff-ng.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/netsniff-ng.spec b/netsniff-ng.spec index f70c814..e9eca3e 100644 --- a/netsniff-ng.spec +++ b/netsniff-ng.spec @@ -55,7 +55,7 @@ install -d $RPM_BUILD_ROOT{%{_sbindir},%{zsh_compdir}} DESTDIR=$RPM_BUILD_ROOT for i in *.zsh - install -p "$i" "%{zsh_compdir}/_${i%.zsh}" + install -p "$i" $RPM_BUILD_ROOT%{zsh_compdir}/_"${i%.zsh}" done %clean gitweb: http://git.pld-linux.org/gitweb.cgi/packages/netsniff-ng.git/commitdiff/c50717c33ce57a2be4fc6eeea931abb8363d95a4 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: netsniff-ng: netsniff-ng-0.6.3.tar.xz
Request by: gotar Files fetched: 1 STORED: http://pub.netsniff-ng.org/netsniff-ng/netsniff-ng-0.6.3.tar.xz e892a7f2e025fba07d0f0a330e9917df netsniff-ng-0.6.3.tar.xz Size: 577752 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/netsniff-ng] initial PLD release
commit ac292e066cd6094d9d5e6951d8463f93e2dc5966 Author: Tomasz PalaDate: Sun Nov 5 16:45:27 2017 +0100 initial PLD release netsniff-ng.spec | 71 1 file changed, 71 insertions(+) --- diff --git a/netsniff-ng.spec b/netsniff-ng.spec new file mode 100644 index 000..f70c814 --- /dev/null +++ b/netsniff-ng.spec @@ -0,0 +1,71 @@ +Summary: A Swiss army knife for network plumbing +Name: netsniff-ng +Version: 0.6.3 +Release: 1 +License: GPL v2 +Group: Networking/Utilities +Source0: http://pub.netsniff-ng.org/netsniff-ng/%{name}-%{version}.tar.xz +# Source0-md5: e892a7f2e025fba07d0f0a330e9917df +URL: http://netsniff-ng.org/ +BuildRequires: GeoIP-devel +BuildRequires: bison +BuildRequires: flex +BuildRequires: libcli-devel +BuildRequires: libnet-devel +BuildRequires: libnetfilter_conntrack-devel +BuildRequires: libnl-devel +BuildRequires: libpcap-devel +BuildRequires: libsodium-devel +BuildRequires: ncurses-devel +BuildRequires: pkgconfig +BuildRequires: rpmbuild(macros) >= 1.719 +BuildRequires: userspace-rcu-devel +BuildRequires: zlib-devel +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +* netsniff-ng, a fast zero-copy analyzer, pcap capturing and replaying tool +* trafgen, a multithreaded low-level zero-copy network packet generator +* mausezahn, high-level packet generator for HW/SW appliances with Cisco-CLI +* bpfc, a Berkeley Packet Filter compiler, Linux BPF JIT disassembler +* ifpps, a top-like kernel networking statistics tool +* flowtop, a top-like netfilter connection tracking tool +* curvetun, a lightweight curve25519-based IP tunnel +* astraceroute, an autonomous system (AS) trace route utility + +%prep +%setup -q + +%build +NACL_INC_DIR=$(pkg-config --variable=includedir libsodium )/sodium \ +NACL_LIB=sodium \ +%configure \ + --sysconfdir="%{_sysconfdir}" \ + --prefix="%{_prefix}" +%{__make} \ + %{?debug:DEBUG=1} \ + %{!?debug:HARDENING=1 CPPFLAGS="%{rpmcflags}"} \ + Q= + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT{%{_sbindir},%{zsh_compdir}} + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +for i in *.zsh + install -p "$i" "%{zsh_compdir}/_${i%.zsh}" +done + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc AUTHORS README REPORTING-BUGS bpf_jit_disasm bpf.vim +%dir %{_sysconfdir}/%{name} +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/* +%attr(755,root,root) %{_sbindir}/* +%{zsh_compdir}/_* +%{_mandir}/man8/*.8* gitweb: http://git.pld-linux.org/gitweb.cgi/packages/netsniff-ng.git/commitdiff/ac292e066cd6094d9d5e6951d8463f93e2dc5966 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/netsniff-ng] Created branch master
The branch 'master' was created. Summary of new commits: ac292e0... initial PLD release ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: iftop: iftop-1.0pre4.tar.gz
Request by: gotar Files fetched: 1 STORED: http://www.ex-parrot.com/~pdw/iftop/download/iftop-1.0pre4.tar.gz 7e6decb4958e8a4890cccac335239f24 iftop-1.0pre4.tar.gz Size: 204665 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/iftop] upgraded to 1.0pre4 note the resolver.patch is commented out since the beginning
commit 343c6c80039496b667ed11cdb47b28919d8fb856 Author: Tomasz PalaDate: Sun Nov 5 09:48:53 2017 +0100 upgraded to 1.0pre4 note the resolver.patch is commented out since the beginning iftop.spec | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) --- diff --git a/iftop.spec b/iftop.spec index decb19d..752611f 100644 --- a/iftop.spec +++ b/iftop.spec @@ -1,6 +1,6 @@ -%definepre pre2 +%definepre pre4 Summary: Display bandwidth usage on an interface -Summary(pl.UTF-8): Wyświetlanie obciążenia na danym interfejsie +Summary(pl.UTF-8): Wyświetlanie ruchu na danym interfejsie Name: iftop Version: 1.0 Release: 0.%{pre}.1 @@ -8,7 +8,7 @@ Epoch: 1 License: GPL v2 Group: Networking/Utilities Source0: http://www.ex-parrot.com/~pdw/iftop/download/%{name}-%{version}%{pre}.tar.gz -# Source0-md5: fef521a49ec0122458d02c64212af3c5 +# Source0-md5: 7e6decb4958e8a4890cccac335239f24 Patch0:%{name}-resolver.patch URL: http://www.ex-parrot.com/~pdw/iftop/ BuildRequires: autoconf @@ -56,6 +56,6 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc AUTHORS ChangeLog README NEWS TODO -%attr(755,root,root) %{_sbindir}/* -%{_mandir}/man8/* +%doc AUTHORS ChangeLog NEWS README TODO +%attr(755,root,root) %{_sbindir}/%{name} +%{_mandir}/man8/%{name}.8* gitweb: http://git.pld-linux.org/gitweb.cgi/packages/iftop.git/commitdiff/343c6c80039496b667ed11cdb47b28919d8fb856 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/dd_rescue] don't break CFLAGS
commit 622e75734c02d2e20c949e228086649765d4f730 Author: Tomasz PalaDate: Sat Oct 14 15:29:55 2017 +0200 don't break CFLAGS dd_rescue.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/dd_rescue.spec b/dd_rescue.spec index b9dd9ba..9778254 100644 --- a/dd_rescue.spec +++ b/dd_rescue.spec @@ -34,8 +34,8 @@ tego nie robi. %configure %{__make} \ CC="%{__cc}" \ - CFLAGS="%{rpmcflags} %{rpmldflags} -DHAVE_CONFIG_H" \ - CFLAGS_OPT='$(CFLAGS)' \ + RPM_OPT_FLAGS="%{rpmcflags}" \ + EXTRA_LDFLAGS="%{rpmldflags}" %install rm -rf $RPM_BUILD_ROOT gitweb: http://git.pld-linux.org/gitweb.cgi/packages/dd_rescue.git/commitdiff/622e75734c02d2e20c949e228086649765d4f730 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: dd_rescue: dd_rescue-1.99.6.tar.bz2
Request by: gotar Files fetched: 1 STORED: http://www.garloff.de/kurt/linux/ddrescue/dd_rescue-1.99.6.tar.bz2 54128a6055e479ead437adf08b62a1c1 dd_rescue-1.99.6.tar.bz2 Size: 171621 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/dd_rescue] upgraded to 1.99.6
commit 98dc11715990739429accebace14cccd584b552c Author: Tomasz PalaDate: Sat Oct 14 14:59:43 2017 +0200 upgraded to 1.99.6 dd_rescue.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/dd_rescue.spec b/dd_rescue.spec index fdc6999..b9dd9ba 100644 --- a/dd_rescue.spec +++ b/dd_rescue.spec @@ -1,12 +1,12 @@ Summary: Data copying in presence of I/O errors Summary(pl.UTF-8): Kopiowanie danych z błędami we/wy Name: dd_rescue -Version: 1.99 +Version: 1.99.6 Release: 1 License: GPL v2 or v3 Group: Applications/System Source0: http://www.garloff.de/kurt/linux/ddrescue/%{name}-%{version}.tar.bz2 -# Source0-md5: b6941bc6cb4879d9b061e08691b77c82 +# Source0-md5: 54128a6055e479ead437adf08b62a1c1 URL: http://www.garloff.de/kurt/linux/ddrescue/ BuildRequires: autoconf BuildRequires: lzo-devel >= 2.07 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/dd_rescue.git/commitdiff/98dc11715990739429accebace14cccd584b552c ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/zsh] set window title under GNU/screen
commit 949fb358437e5e55f7d3842429ff02cfb9cbca70 Author: Tomasz PalaDate: Sun Oct 8 11:43:20 2017 +0200 set window title under GNU/screen zshrc | 4 1 file changed, 4 insertions(+) --- diff --git a/zshrc b/zshrc index a709d6d..0eb27b6 100644 --- a/zshrc +++ b/zshrc @@ -46,3 +46,7 @@ case "$TERM" in bindkey '^[[B' history-beginning-search-forward >/dev/null 2>&1 ;; esac +if [ "$TERM" = 'screen' ]; then + screen_title () { print -Pn "\ek%n@%m: %~\e\\" } + precmd_functions=(screen_title) +fi gitweb: http://git.pld-linux.org/gitweb.cgi/packages/zsh.git/commitdiff/69754942d3867f689add3a6ccf7dc4f33be37942 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/zsh] switched to official distribution source
commit 36ebb9beda848a717a520aeafd0bc731239fb62f Author: Tomasz PalaDate: Sun Oct 8 11:59:07 2017 +0200 switched to official distribution source zsh.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- diff --git a/zsh.spec b/zsh.spec index 937ca3e..060917e 100644 --- a/zsh.spec +++ b/zsh.spec @@ -1,4 +1,5 @@ # +# TODO: package http://www.zsh.org/pub/zsh-%{version}-doc.tar.xz # Conditional build: %bcond_withstatic # build static version %bcond_without tests # don't perform "make test" @@ -18,8 +19,8 @@ Version: 5.4.2 Release: 1 License: BSD-like Group: Applications/Shells -Source0: ftp://sunsite.icm.edu.pl/pub/unix/shells/zsh/%{name}-%{version}.tar.xz -# Source0-md5: dfe156fd69b0d8d1745ecf6d6e02e047 +Source0: http://downloads.sourceforge.net/zsh/%{name}-%{version}.tar.xz +# Source0-md5: afba2dfb445a3eb79bd73330fc005ef7 #Source0: ftp://ftp.zsh.org/pub/%{name}-%{version}.tar.bz2 Source1: %{name}.1.pl Source2: http://zsh.sunsite.dk/Guide/%{name}guide.pdf gitweb: http://git.pld-linux.org/gitweb.cgi/packages/zsh.git/commitdiff/36ebb9beda848a717a520aeafd0bc731239fb62f ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: zsh: zsh-5.4.2.tar.xz zshguide.pdf
Request by: gotar Files fetched: 1 STORED: http://downloads.sourceforge.net/zsh/zsh-5.4.2.tar.xz afba2dfb445a3eb79bd73330fc005ef7 zsh-5.4.2.tar.xz Size: 2983492 bytes ALREADY GOT: http://zsh.sunsite.dk/Guide/zshguide.pdf 70cc3760dd8140f9aed693d484cd87dc zshguide.pdf -- 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/zsh] 3 more tests failing without tty
commit ddc691b8bc2e536f24bcee003c449dbb54bd Author: Tomasz PalaDate: Sun Oct 8 12:11:16 2017 +0200 3 more tests failing without tty zsh.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/zsh.spec b/zsh.spec index 060917e..3b60dba 100644 --- a/zsh.spec +++ b/zsh.spec @@ -207,7 +207,7 @@ cd .. %if %{with tests} if ! tty; then - rm Test/{C02cond.ztst,Y01completion.ztst,Y02compmatch.ztst,Y03arguments.ztst} + rm Test/{C02cond,Y01completion,Y02compmatch,Y03arguments,V08zpty,X02zlevi,X03zlebindkey}.ztst fi %{__make} test %endif gitweb: http://git.pld-linux.org/gitweb.cgi/packages/zsh.git/commitdiff/ddc691b8bc2e536f24bcee003c449dbb54bd ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: zsh: ERRORS: zsh-5.4.2.tar.xz zshguide.pdf
Request by: gotar wget -nv --no-iri --no-check-certificate --user-agent=PLD/distfiles -O ./tmp/6c3707cd-b938-4345-86b4-2b4b4fe86e11/dfe156fd69b0d8d1745ecf6d6e02e047/zsh-5.4.2.tar.xz ftp://sunsite.icm.edu.pl/pub/unix/shells/zsh/zsh-5.4.2.tar.xz: No such file âzsh-5.4.2.tar.xzâ. wget -nv --no-iri --no-check-certificate --user-agent=PLD/distfiles -O ./tmp/6c3707cd-b938-4345-86b4-2b4b4fe86e11/dfe156fd69b0d8d1745ecf6d6e02e047/zsh-5.4.2.tar.xz ftp://sunsite.icm.edu.pl/pub/unix/shells/zsh/zsh-5.4.2.tar.xz: exited with code 8 (0x00) wget -nv --no-iri --no-check-certificate --user-agent=PLD/distfiles --passive-ftp -O ./tmp/6c3707cd-b938-4345-86b4-2b4b4fe86e11/dfe156fd69b0d8d1745ecf6d6e02e047/zsh-5.4.2.tar.xz ftp://sunsite.icm.edu.pl/pub/unix/shells/zsh/zsh-5.4.2.tar.xz: No such file âzsh-5.4.2.tar.xzâ. wget -nv --no-iri --no-check-certificate --user-agent=PLD/distfiles --passive-ftp -O ./tmp/6c3707cd-b938-4345-86b4-2b4b4fe86e11/dfe156fd69b0d8d1745ecf6d6e02e047/zsh-5.4.2.tar.xz ftp://sunsite.icm.edu.pl/pub/unix/shells/zsh/zsh-5.4.2.tar.xz: exited with code 8 (0x00) FATAL: ftp://sunsite.icm.edu.pl/pub/unix/shells/zsh/zsh-5.4.2.tar.xz (dfe156fd69b0d8d1745ecf6d6e02e047) was not fetched correctly (wget -nv --no-iri --no-check-certificate --user-agent=PLD/distfiles -O ./tmp/6c3707cd-b938-4345-86b4-2b4b4fe86e11/dfe156fd69b0d8d1745ecf6d6e02e047/zsh-5.4.2.tar.xz ftp://sunsite.icm.edu.pl/pub/unix/shells/zsh/zsh-5.4.2.tar.xz: No such file âzsh-5.4.2.tar.xzâ. No such file âzsh-5.4.2.tar.xzâ. ): file fetched but has 0 length Files fetched: 0 ALREADY GOT: http://zsh.sunsite.dk/Guide/zshguide.pdf 70cc3760dd8140f9aed693d484cd87dc zshguide.pdf -- 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/zsh] upgraded to 5.4.2
commit 69754942d3867f689add3a6ccf7dc4f33be37942 Author: Tomasz PalaDate: Sun Oct 8 11:46:46 2017 +0200 upgraded to 5.4.2 zsh.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/zsh.spec b/zsh.spec index e1fb785..937ca3e 100644 --- a/zsh.spec +++ b/zsh.spec @@ -14,12 +14,12 @@ Summary(ru.UTF-8): Командный процессор (shell) похожый Summary(tr.UTF-8): Gelişmiş bir BASH sürümü Summary(uk.UTF-8): Командний процесор (shell) схожий на ksh, але з покращеннями Name: zsh -Version: 5.2 +Version: 5.4.2 Release: 1 License: BSD-like Group: Applications/Shells Source0: ftp://sunsite.icm.edu.pl/pub/unix/shells/zsh/%{name}-%{version}.tar.xz -# Source0-md5: afe96fde08b70e23c1cab1ca7a68fb34 +# Source0-md5: dfe156fd69b0d8d1745ecf6d6e02e047 #Source0: ftp://ftp.zsh.org/pub/%{name}-%{version}.tar.bz2 Source1: %{name}.1.pl Source2: http://zsh.sunsite.dk/Guide/%{name}guide.pdf gitweb: http://git.pld-linux.org/gitweb.cgi/packages/zsh.git/commitdiff/69754942d3867f689add3a6ccf7dc4f33be37942 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ipsec-tools] fixed psk.txt file permissions (were too weak for daemon), removed las
commit 99491f631317052ed0a7859b6ccd10f56418ba5b Author: Tomasz PalaDate: Fri Sep 29 03:00:13 2017 +0200 fixed psk.txt file permissions (were too weak for daemon), removed las ipsec-tools.spec | 8 1 file changed, 4 insertions(+), 4 deletions(-) --- diff --git a/ipsec-tools.spec b/ipsec-tools.spec index 1f381ff..359b563 100644 --- a/ipsec-tools.spec +++ b/ipsec-tools.spec @@ -12,7 +12,7 @@ Summary: User-space IPsec tools for the Linux IPsec implementation Summary(pl.UTF-8): Narzędzia przestrzeni użytkownika dla linuksowej implementacji IPsec Name: ipsec-tools Version: 0.8.2 -Release: 2 +Release: 3 License: BSD Group: Networking/Admin Source0: http://downloads.sourceforge.net/ipsec-tools/%{name}-%{version}.tar.bz2 @@ -153,6 +153,8 @@ install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/racoon install %{SOURCE3} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf install src/racoon/samples/*.txt src/racoon/samples/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/racoon +%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la + %clean rm -rf $RPM_BUILD_ROOT @@ -184,7 +186,7 @@ fi %attr(755,root,root) %{_sbindir}/setkey %attr(754,root,root) /etc/rc.d/init.d/racoon %attr(750,root,root) %dir %{_sysconfdir}/racoon -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/racoon/*.txt +%config(noreplace) %verify(not md5 mtime size) %attr(600,root,root) %{_sysconfdir}/racoon/*.txt %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/racoon/*.conf %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/racoon /usr/lib/tmpfiles.d/%{name}.conf @@ -206,8 +208,6 @@ fi %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libipsec.so %attr(755,root,root) %{_libdir}/libracoon.so -%{_libdir}/libipsec.la -%{_libdir}/libracoon.la %{_includedir}/libipsec %{_includedir}/racoon %{_mandir}/man3/ipsec_*.3* gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ipsec-tools.git/commitdiff/99491f631317052ed0a7859b6ccd10f56418ba5b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/vbindiff] upgraded to 3.5 beta 5
commit 7d315ec722f62d0e3a58b15ab097f988e6c6311f Author: Tomasz PalaDate: Thu Sep 28 19:02:48 2017 +0200 upgraded to 3.5 beta 5 vbindiff.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/vbindiff.spec b/vbindiff.spec index 2b7c940..896338c 100644 --- a/vbindiff.spec +++ b/vbindiff.spec @@ -1,13 +1,13 @@ -%definepre beta4 +%definepre beta5 Summary: diff with editing capabilities for binary files Summary(pl.UTF-8): Odpowiednik diffa dla plików binarnych z możliwością edycji Name: vbindiff Version: 3.0 -Release: 0.%{pre}.3 +Release: 0.%{pre}.1 License: GPL v2+ Group: Applications/Editors Source0: http://www.cjmweb.net/vbindiff/%{name}-%{version}_%{pre}.tar.gz -# Source0-md5: dbda80ef580e1a0975ef50b9aaa5210e +# Source0-md5: bbde86b790d6a912e3ba11d6cd8b1a2a URL: http://www.cjmweb.net/vbindiff/ BuildRequires: autoconf BuildRequires: automake gitweb: http://git.pld-linux.org/gitweb.cgi/packages/vbindiff.git/commitdiff/7d315ec722f62d0e3a58b15ab097f988e6c6311f ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: vbindiff: vbindiff-3.0_beta5.tar.gz
Request by: gotar Files fetched: 1 STORED: http://www.cjmweb.net/vbindiff/vbindiff-3.0_beta5.tar.gz bbde86b790d6a912e3ba11d6cd8b1a2a vbindiff-3.0_beta5.tar.gz Size: 128406 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/gdb] R: guile with scm_set_automatic_finalization_enabled
commit 3d4c800951f8dd68e08f933c3e297874144baa46 Author: Tomasz PalaDate: Sun Sep 3 20:28:38 2017 +0200 R: guile with scm_set_automatic_finalization_enabled as it is currently build with 2.0.12 that provides this gdb.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/gdb.spec b/gdb.spec index 0f0a298..7899fb6 100644 --- a/gdb.spec +++ b/gdb.spec @@ -77,7 +77,7 @@ Obsoletes:python-gdb # for traceback module Requires: python-modules %endif -%{?with_guile:Requires:guile >= 2.0} +%{?with_guile:Requires:guile >= 2.0.12} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description gitweb: http://git.pld-linux.org/gitweb.cgi/packages/gdb.git/commitdiff/3d4c800951f8dd68e08f933c3e297874144baa46 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/lesspipe] highlight 3.0 beta+ support -disabled separate output format options (use --out-format instead)
commit de67b3500df4a0a90c78222d8ff110ef43bfc525 Author: Tomasz PalaDate: Wed Aug 23 22:09:27 2017 +0200 highlight 3.0 beta+ support -disabled separate output format options (use --out-format instead) lesspipe.sh | 2 +- lesspipe.spec | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) --- diff --git a/lesspipe.spec b/lesspipe.spec index 66dc607..f416873 100644 --- a/lesspipe.spec +++ b/lesspipe.spec @@ -6,17 +6,18 @@ Summary: Input preprocessor for less Summary(pl.UTF-8): Preprocesor wejścia dla narzędzia less Name: lesspipe Version: 1.57 -Release: 1 +Release: 2 License: GPL v2 Group: Applications/Text Source0: %{name}.sh BuildRequires: rpmbuild(macros) >= 1.316 Suggests: file Suggests: gnupg -Suggests: highlight +Suggests: highlight >= 3.0 Suggests: mailcap >= 2.3 Suggests: objdump Suggests: openssl-tools +Conflicts: highlight < 3.0 Conflicts: less < 394-7.1 Conflicts: tar < 1:1.22 BuildArch: noarch diff --git a/lesspipe.sh b/lesspipe.sh index d7c89ca..dbf5658 100755 --- a/lesspipe.sh +++ b/lesspipe.sh @@ -149,7 +149,7 @@ lesspipe() { output=ansi;; esac run-mailcap "$1" || { - echo "$LESS" | grep -qi r || ps -p $PPID,$(ps -p $PPID -oppid=) -oargs= | grep -qiw -- -r && highlight --$output --style=darkblue "$1"; + echo "$LESS" | grep -qi r || ps -p $PPID,$(ps -p $PPID -oppid=) -oargs= | grep -qiw -- -r && highlight --out-format=$output --style=darkblue "$1"; } # Check to see if binary, if so -- view with 'strings' # FILE=$(file -L "$1") gitweb: http://git.pld-linux.org/gitweb.cgi/packages/lesspipe.git/commitdiff/de67b3500df4a0a90c78222d8ff110ef43bfc525 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/btrfs-progs] upgraded to 4.12
commit 35aaeb321137cc7e15316423b026801a6a526c43 Author: Tomasz PalaDate: Sun Aug 13 18:16:51 2017 +0200 upgraded to 4.12 btrfs-progs.spec | 29 + 1 file changed, 13 insertions(+), 16 deletions(-) --- diff --git a/btrfs-progs.spec b/btrfs-progs.spec index d3d1c17..e7c721c 100644 --- a/btrfs-progs.spec +++ b/btrfs-progs.spec @@ -1,23 +1,23 @@ Summary: Utilities belonging to the btrfs filesystem Summary(pl.UTF-8): Narzędzia należące do systemu plików btrfs Name: btrfs-progs -Version: 4.7 +Version: 4.12 Release: 1 License: GPL v2 Group: Applications/System Source0: https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/%{name}-v%{version}.tar.xz -# Source0-md5: ce139902859bb0ed9efd3b120ede371e +# Source0-md5: 4b1a143677597de413381118db8c10bb Patch0:%{name}-man.patch URL: http://btrfs.wiki.kernel.org/ BuildRequires: acl-devel BuildRequires: asciidoc BuildRequires: autoconf >= 2.60 -BuildRequires: e2fsprogs-devel +BuildRequires: e2fsprogs-devel >= 1.42.0 BuildRequires: libblkid-devel BuildRequires: libcom_err-devel BuildRequires: libuuid-devel BuildRequires: lzo-devel >= 2 -BuildRequires: pkgconfig +BuildRequires: pkgconfig >= 0.9.0 BuildRequires: tar >= 1:1.22 BuildRequires: xmlto BuildRequires: xz @@ -84,27 +84,24 @@ install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8} libdir=%{_libdir} \ DESTDIR=$RPM_BUILD_ROOT -ln -sf btrfsck $RPM_BUILD_ROOT%{_sbindir}/fsck.btrfs - %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc INSTALL -%attr(755,root,root) %{_sbindir}/btrfsck -%attr(755,root,root) %{_sbindir}/mkfs.btrfs -%attr(755,root,root) %{_sbindir}/fsck.btrfs +%doc CHANGES README.md +%attr(755,root,root) %{_sbindir}/btrfs +%attr(755,root,root) %{_sbindir}/btrfs-convert %attr(755,root,root) %{_sbindir}/btrfs-debug-tree +%attr(755,root,root) %{_sbindir}/btrfs-find-root %attr(755,root,root) %{_sbindir}/btrfs-image -%attr(755,root,root) %{_sbindir}/btrfs-convert -%attr(755,root,root) %{_sbindir}/btrfstune -%attr(755,root,root) %{_sbindir}/btrfs %attr(755,root,root) %{_sbindir}/btrfs-map-logical -%attr(755,root,root) %{_sbindir}/btrfs-zero-log -%attr(755,root,root) %{_sbindir}/btrfs-find-root %attr(755,root,root) %{_sbindir}/btrfs-select-super -%attr(755,root,root) %{_sbindir}/btrfs-show-super +%attr(755,root,root) %{_sbindir}/btrfs-zero-log +%attr(755,root,root) %{_sbindir}/btrfsck +%attr(755,root,root) %{_sbindir}/btrfstune +%attr(755,root,root) %{_sbindir}/fsck.btrfs +%attr(755,root,root) %{_sbindir}/mkfs.btrfs %attr(755,root,root) %{_libdir}/libbtrfs.so.*.* %attr(755,root,root) %ghost %{_libdir}/libbtrfs.so.0 /lib/udev/rules.d/64-btrfs-dm.rules gitweb: http://git.pld-linux.org/gitweb.cgi/packages/btrfs-progs.git/commitdiff/35aaeb321137cc7e15316423b026801a6a526c43 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: btrfs-progs: btrfs-progs-v4.12.tar.xz
Request by: gotar Files fetched: 1 STORED: https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v4.12.tar.xz 4b1a143677597de413381118db8c10bb btrfs-progs-v4.12.tar.xz Size: 1587604 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/FHS] introduce /usr/{,local/}libexec directories
commit d49d853dc96ef5cd1a7d7f8f900577608a38be03 Author: Tomasz PalaDate: Thu Jul 6 11:41:42 2017 +0200 introduce /usr/{,local/}libexec directories https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch04s07.html Note, that /usr/local/libexec is not mentioned explicitly in https://refspecs.linuxfoundation.org/FHS_3.0/fhs-3.0.html#requirements10, but rationale behind both libexec and local hierarchy allow us to treat this as lib. Since /usr/local/libexec should exist for GNU applications according to https://www.gnu.org/prep/standards/html_node/Directory-Variables.html, we must provide /usr/libexec directory as well to met FHS requirements. FHS.spec | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) --- diff --git a/FHS.spec b/FHS.spec index f92f737..3291fdd 100644 --- a/FHS.spec +++ b/FHS.spec @@ -12,7 +12,7 @@ Summary(pl.UTF-8):Podstawowy układ katalogów systemu Linux zgodny z FHS 3.0 Summary(tr.UTF-8): Temel dosya sistemi yapısı Name: FHS Version: 3.0 -Release: 1 +Release: 2 License: GPL Group: Base URL: http://refspecs.linuxfoundation.org/fhs.shtml @@ -83,10 +83,10 @@ install -d \ $RPM_BUILD_ROOT/etc/{X11,opt} \ $RPM_BUILD_ROOT/lib/modules \ $RPM_BUILD_ROOT/{mnt,media,proc,root/tmp,sbin,tmp} \ - $RPM_BUILD_ROOT/usr/{bin,games,include,lib,sbin,share,src} \ + $RPM_BUILD_ROOT/usr/{bin,games,include,lib{,exec},sbin,share,src} \ $RPM_BUILD_ROOT/usr/share/{color/icc,dict,doc,games,info,misc,ppd,tmac,xml} \ $RPM_BUILD_ROOT/usr/lib/games \ - $RPM_BUILD_ROOT/usr/local/{bin,etc,games,include,lib,sbin,share/{color/icc,doc,info,man},src} \ + $RPM_BUILD_ROOT/usr/local/{bin,etc,games,include,lib{,exec},sbin,share/{color/icc,doc,info,man},src} \ $RPM_BUILD_ROOT/var/{cache,crash,db,games,lib/{color/icc,misc},local,lock,log,mail,opt,run,spool,tmp,yp} %if %{with lib64} @@ -165,6 +165,7 @@ posix.chown("/var/lock", 0, %{gid_uucp}) %dir /usr/games %dir /usr/include %dir /usr/lib +%dir /usr/libexec %dir /usr/lib/games %dir /usr/sbin %dir /usr/share @@ -187,6 +188,7 @@ posix.chown("/var/lock", 0, %{gid_uucp}) %dir /usr/local/games %dir /usr/local/include %dir /usr/local/lib +%dir /usr/local/libexec %dir /usr/local/sbin %dir /usr/local/share %dir /usr/local/share/color gitweb: http://git.pld-linux.org/gitweb.cgi/packages/FHS.git/commitdiff/d49d853dc96ef5cd1a7d7f8f900577608a38be03 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: dia: dia-0.97.3.tar.xz central_data_processing.zip chemistry_lab.zip cmos.zip digital.zip edpc.zip electronic.zip lst.zip optics.zip Racks.zip ...
Request by: gotar Files fetched: 10 ALREADY GOT: http://ftp.gnome.org/pub/gnome/sources/dia/0.97/dia-0.97.3.tar.xz 0e744a0f6a6c4cb6a089e4d955392c3c dia-0.97.3.tar.xz ALREADY GOT: http://dia-installer.de/shapes/central_data_processing/central_data_processing.zip 103865b35609d2a0f8a0e034c49cf130 central_data_processing.zip ALREADY GOT: http://dia-installer.de/shapes/chemistry_lab/chemistry_lab.zip ad752d7dfb733b6a9f8c54e05685223c chemistry_lab.zip ALREADY GOT: http://dia-installer.de/shapes/cmos/cmos.zip 65f319c9c0c15d0691f9e97fd034c005 cmos.zip ALREADY GOT: http://dia-installer.de/shapes/digital/digital.zip 8eef8562b618254fc5ebd4ac3f4f15ed digital.zip ALREADY GOT: http://dia-installer.de/shapes/edpc/edpc.zip 6d62a586419b5ed616cc2a67f80a2e3d edpc.zip ALREADY GOT: http://dia-installer.de/shapes/electronic/electronic.zip ddeca421f725af66be41f14ab170b2b8 electronic.zip ALREADY GOT: http://dia-installer.de/shapes/lst/lst.zip 84d216457305ae53eb1635f6abaa4368 lst.zip ALREADY GOT: http://dia-installer.de/shapes/optics/optics.zip 6c2bb1ffa6229b832e2d24fb1fd927c9 optics.zip ALREADY GOT: http://dia-installer.de/shapes/Racks/Racks.zip 5ca48da8899b28ed266e21ba522d1e64 Racks.zip ALREADY GOT: http://dia-installer.de/shapes/renewable_energy/renewable_energy.zip 13e7e934ab87b924101faaf56414ad00 renewable_energy.zip ALREADY GOT: http://dia-installer.de/shapes/scenegraph/scenegraph.zip 2bca8efa9bae10c13968ebacc9f1a00b scenegraph.zip STORED: http://dia-installer.de/shapes/gradient/gradient.zip 74cf1befc74dd2775780664c3bbf5f6f gradient.zip Size: 23437 bytes STORED: http://dia-installer.de/shapes/HVAC/HVAC.zip 8789f851c6bc464977d991de28464076 HVAC.zip Size: 28821 bytes STORED: http://dia-installer.de/shapes/Electrical/Electrical.zip 5c5abbc16025b31a6d317dbd472d8d78 Electrical.zip Size: 139155 bytes STORED: http://dia-installer.de/shapes/electric2/electric2.zip 0853a35f5df120d2eae441de107fd57a electric2.zip Size: 13087 bytes STORED: http://dia-installer.de/shapes/Circuit2/Circuit2.zip d3d03e2ec873daa8a368e83823b5c9c1 Circuit2.zip Size: 37187 bytes STORED: http://dia-installer.de/shapes/CH-1/CH-1.zip 0e30c10b308c9dbab56ac445067bc983 CH-1.zip Size: 20255 bytes STORED: http://dia-installer.de/shapes/building_site/building_site.zip 5ba58c82686b845c3026bcb770c55850 building_site.zip Size: 25546 bytes STORED: http://dia-installer.de/shapes/AUTOSAR/AUTOSAR.zip 16593b97d1c76d31891923abd4b4925f AUTOSAR.zip Size: 29594 bytes STORED: http://dia-installer.de/shapes/Automata/Automata.zip 82f60fe376fcbe238b46d60e2dfdf355 Automata.zip Size: 13242 bytes STORED: http://dia-installer.de/shapes/value_stream_mapping/value_stream_mapping.zip 98705330f435f06c7a8864b543ef4617 value_stream_mapping.zip Size: 26863 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/dia] additional shapes packaged
commit 6a4286291922f96df08d9fbe9b072356282bf03f Author: Tomasz PalaDate: Wed Jun 21 08:45:29 2017 +0200 additional shapes packaged dia.spec | 30 ++ 1 file changed, 30 insertions(+) --- diff --git a/dia.spec b/dia.spec index 42b2030..4cfee71 100644 --- a/dia.spec +++ b/dia.spec @@ -36,6 +36,26 @@ Source10: http://dia-installer.de/shapes/renewable_energy/renewable_energy.zip # Source10-md5:13e7e934ab87b924101faaf56414ad00 Source11: http://dia-installer.de/shapes/scenegraph/scenegraph.zip # Source11-md5:2bca8efa9bae10c13968ebacc9f1a00b +Source12: http://dia-installer.de/shapes/gradient/gradient.zip +# Source12-md5:74cf1befc74dd2775780664c3bbf5f6f +Source13: http://dia-installer.de/shapes/HVAC/HVAC.zip +# Source13-md5:8789f851c6bc464977d991de28464076 +Source14: http://dia-installer.de/shapes/Electrical/Electrical.zip +# Source14-md5:5c5abbc16025b31a6d317dbd472d8d78 +Source15: http://dia-installer.de/shapes/electric2/electric2.zip +# Source15-md5:0853a35f5df120d2eae441de107fd57a +Source16: http://dia-installer.de/shapes/Circuit2/Circuit2.zip +# Source16-md5:d3d03e2ec873daa8a368e83823b5c9c1 +Source17: http://dia-installer.de/shapes/CH-1/CH-1.zip +# Source17-md5:0e30c10b308c9dbab56ac445067bc983 +Source18: http://dia-installer.de/shapes/building_site/building_site.zip +# Source18-md5:5ba58c82686b845c3026bcb770c55850 +Source19: http://dia-installer.de/shapes/AUTOSAR/AUTOSAR.zip +# Source19-md5:16593b97d1c76d31891923abd4b4925f +Source20: http://dia-installer.de/shapes/Automata/Automata.zip +# Source20-md5:82f60fe376fcbe238b46d60e2dfdf355 +Source21: http://dia-installer.de/shapes/value_stream_mapping/value_stream_mapping.zip +# Source21-md5:98705330f435f06c7a8864b543ef4617 Patch0:%{name}-wmf-cast.patch URL: https://live.gnome.org/Dia BuildRequires: autoconf >= 2.50 @@ -165,6 +185,16 @@ unzip -n -d $RPM_BUILD_ROOT%{_datadir}/%{name} %{SOURCE8} unzip -n -d $RPM_BUILD_ROOT%{_datadir}/%{name} %{SOURCE9} unzip -n -d $RPM_BUILD_ROOT%{_datadir}/%{name} %{SOURCE10} unzip -n -d $RPM_BUILD_ROOT%{_datadir}/%{name} %{SOURCE11} +unzip -n -d $RPM_BUILD_ROOT%{_datadir}/%{name} %{SOURCE12} +unzip -n -d $RPM_BUILD_ROOT%{_datadir}/%{name} %{SOURCE13} +unzip -n -d $RPM_BUILD_ROOT%{_datadir}/%{name} %{SOURCE14} +unzip -n -d $RPM_BUILD_ROOT%{_datadir}/%{name} %{SOURCE15} +unzip -n -d $RPM_BUILD_ROOT%{_datadir}/%{name} %{SOURCE16} +unzip -n -d $RPM_BUILD_ROOT%{_datadir}/%{name} %{SOURCE17} +unzip -n -d $RPM_BUILD_ROOT%{_datadir}/%{name} %{SOURCE18} +unzip -n -d $RPM_BUILD_ROOT%{_datadir}/%{name} %{SOURCE19} +unzip -n -d $RPM_BUILD_ROOT%{_datadir}/%{name} %{SOURCE20} +unzip -n -d $RPM_BUILD_ROOT%{_datadir}/%{name} %{SOURCE21} %{__rm} $RPM_BUILD_ROOT%{_libdir}/dia/*.la %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/mime-info gitweb: http://git.pld-linux.org/gitweb.cgi/packages/dia.git/commitdiff/6a4286291922f96df08d9fbe9b072356282bf03f ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/qgis] chmod +x plugins
commit adafd11f3520647423649492cdf3f11f08804369 Author: Tomasz PalaDate: Mon Jun 5 02:00:40 2017 +0200 chmod +x plugins qgis.spec | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) --- diff --git a/qgis.spec b/qgis.spec index 8c58363..aea5bb2 100644 --- a/qgis.spec +++ b/qgis.spec @@ -122,8 +122,11 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/qbrowser %attr(755,root,root) %{_bindir}/qgis %attr(755,root,root) %{_libdir}/libqgis*.so.*.*.* -%{_libdir}/%{name} -%exclude %{_libdir}/%{name}/grass +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/plugins +%attr(755,root,root) %{_libdir}/%{name}/crssync +%attr(755,root,root) %{_libdir}/%{name}/qgis_help +%attr(755,root,root) %{_libdir}/%{name}/plugins/lib*.so %exclude %{_libdir}/%{name}/plugins/libgrass*.so %exclude %{_libdir}/libqgisgrass*.so.*.*.* %exclude %{_libdir}/libqgispython.so.*.*.* gitweb: http://git.pld-linux.org/gitweb.cgi/packages/qgis.git/commitdiff/adafd11f3520647423649492cdf3f11f08804369 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/qgis] fixed mandir install directory, grass subpackage created
commit e5ca2a4f66566e3b7200cc7ce884129eab326230 Author: Tomasz PalaDate: Mon Jun 5 01:12:01 2017 +0200 fixed mandir install directory, grass subpackage created qgis.spec | 28 +++- 1 file changed, 15 insertions(+), 13 deletions(-) --- diff --git a/qgis.spec b/qgis.spec index 7885313..8c58363 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,4 +1,4 @@ -# TODO: grass, python and server subpackages +# TODO: python and server subpackages Summary: Quantum GIS (QGIS) - a Geographic Information System (GIS) Summary(pl.UTF-8): Quantum GIS (QGIS) - system informacji geograficznych (GIS) Name: qgis @@ -75,17 +75,14 @@ Header files for QGIS. %description devel -l pl.UTF-8 Pliki nagłówkowe QGIS. -%package static -Summary: Static QGIS library -Summary(pl.UTF-8): Statyczna biblioteka QGIS -Group: Development/Libraries -Requires: %{name}-devel = %{version}-%{release} - -%description static -Static QGIS library. +%package grass +Summary: GRASS support for QGIS +Summary(pl.UTF-8): Wsparcie GRASS dla QGIS-a +Group: Applications/Engineering +Suggests: grass -%description static -l pl.UTF-8 -Statyczna biblioteka QGIS. +%description grass +GRASS plugin for QGIS required to interface with the GRASS system. %prep %setup -q @@ -94,6 +91,7 @@ Statyczna biblioteka QGIS. %build %cmake . \ -DGRASS_INCLUDE_DIR7=%{_includedir}/grass72 \ + -DQGIS_MANUAL_SUBDIR=/share/man \ -DENABLE_TESTS:BOOL=FALSE # TODO: rpm/qgis.spec.template @@ -130,6 +128,7 @@ rm -rf $RPM_BUILD_ROOT %exclude %{_libdir}/libqgisgrass*.so.*.*.* %exclude %{_libdir}/libqgispython.so.*.*.* %{_datadir}/%{name} +%exclude %{_datadir}/%{name}/grass %exclude %{_datadir}/%{name}/python %{_desktopdir}/q*.desktop %{_pixmapsdir}/q*.png @@ -141,6 +140,9 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/libqgis*.so %{_includedir}/%{name} -%files static +%files grass %defattr(644,root,root,755) -#%{_libdir}/libqgis.a +%{_libdir}/%{name}/grass +%attr(755,root,root) %{_libdir}/%{name}/plugins/libgrass*.so +%attr(755,root,root) %{_libdir}/libqgisgrass*.so.*.*.* +%{_datadir}/%{name}/grass gitweb: http://git.pld-linux.org/gitweb.cgi/packages/qgis.git/commitdiff/e5ca2a4f66566e3b7200cc7ce884129eab326230 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/qgis] cmake invocation fixed
commit d9a8b9db1814533c3bd30cf33e3a4eeb647ea151 Author: Tomasz PalaDate: Mon Jun 5 00:22:18 2017 +0200 cmake invocation fixed qgis.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/qgis.spec b/qgis.spec index 01e598e..7885313 100644 --- a/qgis.spec +++ b/qgis.spec @@ -93,8 +93,8 @@ Statyczna biblioteka QGIS. %build %cmake . \ - -D GRASS_INCLUDE_DIR7=%{_includedir}/grass72 \ - -D ENABLE_TESTS:BOOL=FALSE + -DGRASS_INCLUDE_DIR7=%{_includedir}/grass72 \ + -DENABLE_TESTS:BOOL=FALSE # TODO: rpm/qgis.spec.template %{__make} gitweb: http://git.pld-linux.org/gitweb.cgi/packages/qgis.git/commitdiff/d9a8b9db1814533c3bd30cf33e3a4eeb647ea151 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/qgis] start work on 2.18.9
commit ce1a8cd926dd306215dafd0b6b48a192f1e5a9b5 Author: Tomasz PalaDate: Sat Jun 3 23:49:25 2017 +0200 start work on 2.18.9 qgis.spec | 21 + 1 file changed, 9 insertions(+), 12 deletions(-) --- diff --git a/qgis.spec b/qgis.spec index e476a4b..5071ad2 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,18 +1,19 @@ Summary: Quantum GIS (QGIS) - a Geographic Information System (GIS) Summary(pl.UTF-8): Quantum GIS (QGIS) - system informacji geograficznych (GIS) Name: qgis -Version: 2.14.2 +Version: 2.18.9 Release: 0.1 License: GPL v2+ Group: Applications/Engineering Source0: http://qgis.org/downloads/%{name}-%{version}.tar.bz2 -# Source0-md5: be8427d171adb07f454e9f3eea349dea +# Source0-md5: d55d4931651d1967876ba89aab8d2935 #Patch0: %{name}-paralelbuild.patch -URL: http://qgis.sourceforge.net/ +URL: http://qgis.org/ BuildRequires: QtGui-devel BuildRequires: QtNetwork-devel BuildRequires: QtSql-devel BuildRequires: QtSvg-devel +#BuildRequires:QtTest-devel BuildRequires: QtUiTools-devel BuildRequires: QtWebKit-devel BuildRequires: QtXml-devel @@ -23,7 +24,7 @@ BuildRequires:expat-devel >= 1.95 BuildRequires: flex >= 2.5.6 BuildRequires: gdal-devel >= 1.4.0 BuildRequires: geos-devel >= 3.4.0 -BuildRequires: grass-devel >= 6.0.0 +#BuildRequires:grass-devel >= 6.0.0 BuildRequires: gsl-devel >= 1.8 BuildRequires: libspatialite-devel BuildRequires: postgresql-devel >= 8.0.0 @@ -34,12 +35,13 @@ BuildRequires: python-PyQt4-qscintilla2 BuildRequires: python-devel >= 2.7 BuildRequires: python-sip-devel >= 4.12 BuildRequires: qca-devel -BuildRequires: qscintilla2-qt4-devel +BuildRequires: qjson-devel BuildRequires: qt4-build BuildRequires: qt4-linguist BuildRequires: qt4-qmake BuildRequires: qwt-devel >= 5.0.0 BuildConflicts:qwt-devel >= 6.1.0 +BuildRequires: sip-PyQt4-qscintilla2 # ...or -DWITH_QWTPOLAR=OFF BuildRequires: spatialindex-devel BuildRequires: sqlite3-devel @@ -87,16 +89,11 @@ Statyczna biblioteka QGIS. #%patch0 -p1 %build -%{__libtoolize} -%{__aclocal} -%{__autoconf} -%{__automake} +%cmake . \ + -DENABLE_TESTS=FALSE -%configure \ - --with-qtdir=%{_prefix} %{__make} - %install rm -rf $RPM_BUILD_ROOT gitweb: http://git.pld-linux.org/gitweb.cgi/packages/qgis.git/commitdiff/0dc306824167449e5510bb1ac06362e9516db5fa ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: qgis: qgis-2.18.9.tar.bz2
Request by: gotar Files fetched: 1 STORED: http://qgis.org/downloads/qgis-2.18.9.tar.bz2 d55d4931651d1967876ba89aab8d2935 qgis-2.18.9.tar.bz2 Size: 84453524 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/qgis] packaging initial update
commit 0dc306824167449e5510bb1ac06362e9516db5fa Author: Tomasz PalaDate: Mon Jun 5 00:13:45 2017 +0200 packaging initial update qgis-paralelbuild.patch | 10 --- qgis.spec | 56 +-- qgis_sip-ftbfs.patch| 183 3 files changed, 216 insertions(+), 33 deletions(-) --- diff --git a/qgis.spec b/qgis.spec index 5071ad2..01e598e 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,13 +1,15 @@ +# TODO: grass, python and server subpackages Summary: Quantum GIS (QGIS) - a Geographic Information System (GIS) Summary(pl.UTF-8): Quantum GIS (QGIS) - system informacji geograficznych (GIS) Name: qgis Version: 2.18.9 -Release: 0.1 +Release: 1 License: GPL v2+ Group: Applications/Engineering Source0: http://qgis.org/downloads/%{name}-%{version}.tar.bz2 # Source0-md5: d55d4931651d1967876ba89aab8d2935 -#Patch0: %{name}-paralelbuild.patch +# 1st chunk of https://daniele.vigano.me/git/dani/copr-dani-qgis/raw/25b8f81ccabbfdb183d4850a66e884c183444f14/qgis_sip-ftbfs.patch +Patch0:%{name}_sip-ftbfs.patch URL: http://qgis.org/ BuildRequires: QtGui-devel BuildRequires: QtNetwork-devel @@ -24,7 +26,7 @@ BuildRequires:expat-devel >= 1.95 BuildRequires: flex >= 2.5.6 BuildRequires: gdal-devel >= 1.4.0 BuildRequires: geos-devel >= 3.4.0 -#BuildRequires:grass-devel >= 6.0.0 +BuildRequires: grass-devel >= 6.0.0 BuildRequires: gsl-devel >= 1.8 BuildRequires: libspatialite-devel BuildRequires: postgresql-devel >= 8.0.0 @@ -38,13 +40,14 @@ BuildRequires: qca-devel BuildRequires: qjson-devel BuildRequires: qt4-build BuildRequires: qt4-linguist -BuildRequires: qt4-qmake +BuildRequires: qt4-qmake >= 4.8.0 BuildRequires: qwt-devel >= 5.0.0 BuildConflicts:qwt-devel >= 6.1.0 -BuildRequires: sip-PyQt4-qscintilla2 # ...or -DWITH_QWTPOLAR=OFF +BuildRequires: sip-PyQt4-qscintilla2 BuildRequires: spatialindex-devel BuildRequires: sqlite3-devel +Suggests: gpsbabel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -86,21 +89,28 @@ Statyczna biblioteka QGIS. %prep %setup -q -#%patch0 -p1 +%patch0 -p1 %build %cmake . \ - -DENABLE_TESTS=FALSE + -D GRASS_INCLUDE_DIR7=%{_includedir}/grass72 \ + -D ENABLE_TESTS:BOOL=FALSE +# TODO: rpm/qgis.spec.template %{__make} %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_datadir}/mime/packages} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}{,/designer}/*.{la,a} +install -p debian/q*.desktop $RPM_BUILD_ROOT%{_desktopdir} +install -p debian/q*.png $RPM_BUILD_ROOT%{_pixmapsdir} +install -p debian/qgis.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages + +# %find_lang %{name} --with-qm %clean rm -rf $RPM_BUILD_ROOT @@ -110,27 +120,27 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc AUTHORS BUGS ChangeLog README TODO -%attr(755,root,root) %{_bindir}/gridmaker +%doc BUGS CONTRIBUTE.md ChangeLog Exception_to_GPL_for_Qt.txt NEWS README.md +%attr(755,root,root) %{_bindir}/qbrowser %attr(755,root,root) %{_bindir}/qgis -%attr(755,root,root) %{_bindir}/qgis_help -%attr(755,root,root) %{_bindir}/spit -%attr(755,root,root) %{_libdir}/libqgis.so.*.*.* -%dir %{_libdir}/%{name} -%attr(755,root,root) %{_libdir}/%{name}/*.so -%dir %{_libdir}/%{name}/designer -%attr(755,root,root) %{_libdir}/%{name}/designer/*.so +%attr(755,root,root) %{_libdir}/libqgis*.so.*.*.* +%{_libdir}/%{name} +%exclude %{_libdir}/%{name}/grass +%exclude %{_libdir}/%{name}/plugins/libgrass*.so +%exclude %{_libdir}/libqgisgrass*.so.*.*.* +%exclude %{_libdir}/libqgispython.so.*.*.* %{_datadir}/%{name} -%{_mandir}/man1/* +%exclude %{_datadir}/%{name}/python +%{_desktopdir}/q*.desktop +%{_pixmapsdir}/q*.png +%{_datadir}/mime/packages/%{name}.xml +%{_mandir}/man1/q*.1* %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/qgis-config -%attr(755,root,root) %{_libdir}/libqgis.so -%{_libdir}/libqgis.la +%attr(755,root,root) %{_libdir}/libqgis*.so %{_includedir}/%{name} -%{_aclocaldir}/qgis.m4 %files static %defattr(644,root,root,755) -%{_libdir}/libqgis.a +#%{_libdir}/libqgis.a diff --git a/qgis-paralelbuild.patch b/qgis-paralelbuild.patch deleted file mode 100644 index 6d8d1e7..000 --- a/qgis-paralelbuild.patch +++ /dev/null @@ -1,10 +0,0 @@ qgis-0.5.0/i18n/Makefile.am.old2004-10-02 02:04:17.0 +0200 -+++ qgis-0.5.0/i18n/Makefile.am2004-12-04 10:58:31.0 +0100 -@@ -33,6 +33,6 @@ - qgis_zh_CN.ts - - %.qm: %.ts -- cd ..; ./create_qm_files.sh -+ lrelease $< -qm $@ - - EXTRA_DIST = $(i18n_SOURCES) diff --git a/qgis_sip-ftbfs.patch b/qgis_sip-ftbfs.patch new file mode 100644 index 000..3a25e88 --- /dev/null +++ b/qgis_sip-ftbfs.patch @@ -0,0 +1,183 @@ +diff
DISTFILES: qgis: qgis-2.14.2.tar.bz2
Request by: gotar Files fetched: 1 STORED: http://qgis.org/downloads/qgis-2.14.2.tar.bz2 be8427d171adb07f454e9f3eea349dea qgis-2.14.2.tar.bz2 Size: 74039963 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/qgis] updated BRs to 2.14.2
commit 3f70786ecdd92c0bddb321a25bb4ba5e4c7aab6c Author: Tomasz PalaDate: Sun May 15 10:31:54 2016 +0200 updated BRs to 2.14.2 qgis.spec | 54 +++--- 1 file changed, 39 insertions(+), 15 deletions(-) --- diff --git a/qgis.spec b/qgis.spec index 5c0cee5..c00ee8a 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,21 +1,45 @@ -Summary: Quantum GIS (QGIS) - a Geographic Information System (GIS) built for Linux/Unix -Summary(pl.UTF-8): Quantum GIS (QGIS) - system informacji geograficznych (GIS) dla Linuksa/Uniksów +Summary: Quantum GIS (QGIS) - a Geographic Information System (GIS) +Summary(pl.UTF-8): Quantum GIS (QGIS) - system informacji geograficznych (GIS) Name: qgis -Version: 0.7.0 +Version: 2.14.2 Release: 0.1 -License: GPL +License: GPL v2+ Group: Applications/Engineering -Source0: http://dl.sourceforge.net/qgis/%{name}-%{version}.tar.gz -# Source0-md5: ffec37c0b4b2fff4bb689801b641eadb -Patch0:%{name}-paralelbuild.patch +Source0: http://qgis.org/downloads/%{name}-%{version}.tar.bz2 +# Source0-md5: be8427d171adb07f454e9f3eea349dea +#Patch0: %{name}-paralelbuild.patch URL: http://qgis.sourceforge.net/ -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: gdal-devel -BuildRequires: geos-devel >= 2.0.0 -BuildRequires: libtool -BuildRequires: qt-devel -BuildRequires: qt-linguist +BuildRequires: QtGui-devel +BuildRequires: QtNetwork-devel +BuildRequires: QtSql-devel +BuildRequires: QtSvg-devel +BuildRequires: QtWebKit-devel +BuildRequires: QtXml-devel +BuildRequires: QtXmlPatterns-devel +BuildRequires: bison >= 2.4 +BuildRequires: cmake >= 2.8.6 +BuildRequires: expat-devel >= 1.95 +BuildRequires: flex >= 2.5.6 +BuildRequires: gdal-devel >= 1.4.0 +BuildRequires: geos-devel >= 3.4.0 +BuildRequires: grass-devel >= 6.0.0 +BuildRequires: gsl-devel >= 1.8 +BuildRequires: libspatialite-devel +BuildRequires: postgresql-devel >= 8.0.0 +BuildRequires: proj-devel >= 4.4.0 +BuildRequires: python-PyQt4-devel-tools >= 4.8.3 +BuildRequires: python-PyQt4-uic >= 4.8.3 +BuildRequires: python-PyQt4-qscintilla2 +BuildRequires: python-devel >= 2.7 +BuildRequires: python-sip-devel >= 4.12 +BuildRequires: qca-devel +BuildRequires: qscintilla2-qt4-devel +BuildRequires: qt4-build +BuildRequires: qt4-qmake +BuildRequires: qwt-devel >= 5.0.0 +BuildConflicts:qwt-devel >= 6.1.0 +# ...or -DWITH_QWTPOLAR=OFF +BuildRequires: spatialindex-devel BuildRequires: sqlite3-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -58,7 +82,7 @@ Statyczna biblioteka QGIS. %prep %setup -q -%patch0 -p1 +#%patch0 -p1 %build %{__libtoolize} gitweb: http://git.pld-linux.org/gitweb.cgi/packages/qgis.git/commitdiff/c7cbb97815af9b76c3949d558ce918165e8b106b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/qgis] remaining BRs added
commit c7cbb97815af9b76c3949d558ce918165e8b106b Author: Tomasz PalaDate: Sun May 15 12:21:46 2016 +0200 remaining BRs added qgis.spec | 2 ++ 1 file changed, 2 insertions(+) --- diff --git a/qgis.spec b/qgis.spec index c00ee8a..e476a4b 100644 --- a/qgis.spec +++ b/qgis.spec @@ -13,6 +13,7 @@ BuildRequires:QtGui-devel BuildRequires: QtNetwork-devel BuildRequires: QtSql-devel BuildRequires: QtSvg-devel +BuildRequires: QtUiTools-devel BuildRequires: QtWebKit-devel BuildRequires: QtXml-devel BuildRequires: QtXmlPatterns-devel @@ -35,6 +36,7 @@ BuildRequires:python-sip-devel >= 4.12 BuildRequires: qca-devel BuildRequires: qscintilla2-qt4-devel BuildRequires: qt4-build +BuildRequires: qt4-linguist BuildRequires: qt4-qmake BuildRequires: qwt-devel >= 5.0.0 BuildConflicts:qwt-devel >= 6.1.0 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/qgis.git/commitdiff/c7cbb97815af9b76c3949d558ce918165e8b106b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/sc-im] XLSX import libraries, XLSX export and XLS import missing in PLD
commit 4f61e7f643c2127f5ee0cbb7e6aadd66ad086bb7 Author: Tomasz PalaDate: Sun Apr 30 15:03:01 2017 +0200 XLSX import libraries, XLSX export and XLS import missing in PLD sc-im.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/sc-im.spec b/sc-im.spec index 9fd7e8d..69d809d 100644 --- a/sc-im.spec +++ b/sc-im.spec @@ -8,12 +8,12 @@ Group:Applications/Math Source0: https://github.com/andmarti1424/sc-im/archive/v%{version}.zip # Source0-md5: 2c81f2a6e0cb24b88ff7a2daa7bc585e URL: https://github.com/andmarti1424/sc-im +BuildRequires: libxml2-devel +BuildRequires: libzip-devel BuildRequires: lua51-devel -#BuildRequires:libxml-devel -#BuildRequires:libzip-devel -#BuildRequires:lxlsreader-devel BuildRequires: ncurses-devel >= 5.0 BuildRequires: yacc +#BuildRequires:xlsreader-devel #BuildRequires:xlsxwriter-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/sc-im.git/commitdiff/4f61e7f643c2127f5ee0cbb7e6aadd66ad086bb7 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/sc-im] actual filenames differ from %{name}
commit 5436d466138158800a17b5047fc2ad0dd40d3ab2 Author: Tomasz PalaDate: Sun Apr 30 14:56:53 2017 +0200 actual filenames differ from %{name} sc-im.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/sc-im.spec b/sc-im.spec index 2dd575d..9fd7e8d 100644 --- a/sc-im.spec +++ b/sc-im.spec @@ -56,6 +56,6 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) %doc BUGS CHANGES HELP KNOWN_ISSUES LICENSE Readme.md USER_REQUESTS WIKI *.png -%attr(755,root,root) %{_bindir}/%{name} -%{_datadir}/%{name} -%{_mandir}/man1/%{name}.1* +%attr(755,root,root) %{_bindir}/scim +%{_datadir}/scim +%{_mandir}/man1/scim.1* gitweb: http://git.pld-linux.org/gitweb.cgi/packages/sc-im.git/commitdiff/5436d466138158800a17b5047fc2ad0dd40d3ab2 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/sc-im] there are important CFLAGS added in Makefile, do not override all
commit 28fe733e0546fe82954c38bd3a758ba780ca53ea Author: Tomasz PalaDate: Sun Apr 30 14:53:06 2017 +0200 there are important CFLAGS added in Makefile, do not override all sc-im.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/sc-im.spec b/sc-im.spec index b9be644..2dd575d 100644 --- a/sc-im.spec +++ b/sc-im.spec @@ -39,8 +39,8 @@ tesktowej, często bazując na wartościach innych komórek (formuła). %setup -q %build +CFLAGS="%{rpmcflags}" \ %{__make} -C src \ - CFLAGS="%{rpmcflags}" \ prefix=%{_prefix} %install gitweb: http://git.pld-linux.org/gitweb.cgi/packages/sc-im.git/commitdiff/28fe733e0546fe82954c38bd3a758ba780ca53ea ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit