[packages/czmq] - rel 3
commit 3017c8443d8a584c5525b6f7e7c9ce6614ed893b
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Mon Jan 26 20:13:08 2015 +0100
- rel 3
czmq.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/czmq.spec b/czmq.spec
index d7ebd41..86d4e5f 100644
--- a/czmq.spec
+++ b/czmq.spec
@@ -2,7 +2,7 @@ Summary:High-level C binding for 0MQ
Summary(pl.UTF-8): Wysokopoziomowe wiązania C dla 0MQ
Name: czmq
Version: 2.2.0
-Release: 2
+Release: 3
License: LGPL v3+
Group: Libraries
Source0: http://download.zeromq.org/%{name}-%{version}.tar.gz
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/czmq.git/commitdiff/3017c8443d8a584c5525b6f7e7c9ce6614ed893b
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/sleuthkit] - release 2 (by relup.sh)
commit 05dad1137ef028a0fc0b0d96aec2ffe38ef5e9e7
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Mon Jan 26 20:14:39 2015 +0100
- release 2 (by relup.sh)
sleuthkit.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/sleuthkit.spec b/sleuthkit.spec
index edc1f87..57f2a95 100644
--- a/sleuthkit.spec
+++ b/sleuthkit.spec
@@ -7,7 +7,7 @@ Summary:The Sleuth Kit - an forensic toolkit for
analyzing file systems and dis
Summary(pl.UTF-8): The Sleuth Kit - zestaw narzędzi wspomagających analizę
systemów plików
Name: sleuthkit
Version: 3.2.3
-Release: 1
+Release: 2
License: IBM Public License/Common Public License
Group: Applications
Source0:
http://downloads.sourceforge.net/sleuthkit/%{name}-%{version}.tar.gz
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/sleuthkit.git/commitdiff/05dad1137ef028a0fc0b0d96aec2ffe38ef5e9e7
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/czmq] - disable -Werror to fix building with latest glibc
commit e50dc128f488330167da5a7d16c7766639840c38
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Mon Jan 26 20:12:35 2015 +0100
- disable -Werror to fix building with latest glibc
czmq.spec | 2 ++
no-Werror.patch | 11 +++
2 files changed, 13 insertions(+)
---
diff --git a/czmq.spec b/czmq.spec
index 8ca6696..d7ebd41 100644
--- a/czmq.spec
+++ b/czmq.spec
@@ -7,6 +7,7 @@ License:LGPL v3+
Group: Libraries
Source0: http://download.zeromq.org/%{name}-%{version}.tar.gz
# Source0-md5: b9c060727275a98e866d4db26345c2d8
+Patch0:no-Werror.patch
URL: http://zeromq.org/
BuildRequires: asciidoc
BuildRequires: libsodium-devel
@@ -49,6 +50,7 @@ Statyczna biblioteka CZMQ.
%prep
%setup -q
+%patch0 -p1
%build
# use include subdir - file names could be too common (zfile.h etc.)
diff --git a/no-Werror.patch b/no-Werror.patch
new file mode 100644
index 000..38344c3
--- /dev/null
+++ b/no-Werror.patch
@@ -0,0 +1,11 @@
+--- czmq-2.2.0/configure.ac~ 2014-04-23 14:46:58.0 +0200
czmq-2.2.0/configure.ac2015-01-26 20:11:55.802471286 +0100
+@@ -295,7 +295,7 @@
+
+ # These options are GNU compiler specific.
+ if test x$GCC = xyes; then
+-CPPFLAGS=-pedantic -Werror -Wall ${CPPFLAGS}
++CPPFLAGS=-pedantic -Wall ${CPPFLAGS}
+ fi
+
+ AM_CONDITIONAL(ON_MINGW, test x$czmq_on_mingw32 = xyes)
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/czmq.git/commitdiff/3017c8443d8a584c5525b6f7e7c9ce6614ed893b
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/rsyslog] - BR libdbi-devel
commit 6174378e15ac17f3f604f7bc187b59b34291dd79
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Mon Jan 26 20:52:39 2015 +0100
- BR libdbi-devel
rsyslog.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/rsyslog.spec b/rsyslog.spec
index 77d0500..99bde10 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -29,6 +29,7 @@ Source4: %{name}.logrotate
Patch0:rsyslog-systemd.patch
URL: http://www.rsyslog.com/
%{?with_gssapi:BuildRequires: heimdal-devel}
+BuildRequires: libdbi-devel
%{?with_mysql:BuildRequires: mysql-devel}
%{?with_snmp:BuildRequires:net-snmp-devel}
BuildRequires: pkgconfig
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rsyslog.git/commitdiff/6174378e15ac17f3f604f7bc187b59b34291dd79
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/gdm2.20] - remove jpegs causing file to fail
commit e57da90fbad3e95ccb46689e202b23c6816c86e5
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Mon Feb 2 17:30:10 2015 +0100
- remove jpegs causing file to fail
gdm2.20.spec | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/gdm2.20.spec b/gdm2.20.spec
index 36a6b6f..bb8e11c 100644
--- a/gdm2.20.spec
+++ b/gdm2.20.spec
@@ -229,10 +229,14 @@ touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
%find_lang gdm --with-gnome --with-omf --all-name
# Remove useless files
-rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.{la,a}
# moved to gnome-session
-rm $RPM_BUILD_ROOT%{_datadir}/xsessions/gnome.desktop
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/xsessions/gnome.desktop
+
+# remove broken jpegs
+%{__rm} $RPM_BUILD_ROOT%{_pixmapsdir}/faces/{dice,launch}.jpg
+
%clean
rm -rf $RPM_BUILD_ROOT
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gdm2.20.git/commitdiff/e57da90fbad3e95ccb46689e202b23c6816c86e5
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/gdm2.20] - rel 9
commit 912cfbb34f608b47e8d942726d4691b341b642b2
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Mon Feb 2 17:31:48 2015 +0100
- rel 9
gdm2.20.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/gdm2.20.spec b/gdm2.20.spec
index bb8e11c..e16db8d 100644
--- a/gdm2.20.spec
+++ b/gdm2.20.spec
@@ -15,7 +15,7 @@ Summary(ru.UTF-8):Дисплейный менеджер GNOME
Summary(uk.UTF-8): Дисплейний менеджер GNOME
Name: gdm2.20
Version: 2.20.11
-Release: 8
+Release: 9
License: GPL/LGPL
Group: X11/Applications
Source0:
http://ftp.gnome.org/pub/GNOME/sources/gdm/2.20/gdm-%{version}.tar.bz2
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gdm2.20.git/commitdiff/912cfbb34f608b47e8d942726d4691b341b642b2
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/kernel/LINUX_3_10] - 3.10.68
commit 2283889766a91858af91d5ca5951fe4fa4e9a436
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Sun Feb 8 13:13:46 2015 +0100
- 3.10.68
kernel.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 018e780..701e86b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -71,7 +71,7 @@
%definerel 1
%definebasever 3.10
-%definepostver .67
+%definepostver .68
%defineversuffix -%{basever}
@@ -116,7 +116,7 @@ Source0:
http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
# Source0-md5: 4f25cd5bec5f8d5a7d935b3f2ccb8481
%if %{postver} != .0
Patch0:
http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5: dd9624f24c3656f53d9da6219db7e61e
+# Patch0-md5: dfa635d7e8975f4c765d5fba7d1fad0d
%endif
Source1: kernel.sysconfig
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/2283889766a91858af91d5ca5951fe4fa4e9a436
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/kernel/LINUX_3_4] - 3.4.106 - fbcon-margins applied upstream
commit 4795e0665ef007a22ea2c554edc90636f54aedc1
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Sun Feb 8 13:10:20 2015 +0100
- 3.4.106
- fbcon-margins applied upstream
kernel-fbcon-margins.patch | 29 -
kernel-vserver-2.3.patch | 2 +-
kernel.spec| 7 +++
3 files changed, 4 insertions(+), 34 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 98a8425..90f8bca 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -93,7 +93,7 @@
%definerel 1
%definebasever 3.4
-%definepostver .105
+%definepostver .106
%defineversuffix -%{basever}
@@ -142,7 +142,7 @@ Source0:
http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
# Source0-md5: 967f72983655e2479f951195953e8480
%if %{postver} != .0
Patch0:
http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5: 0f43fcca926776fd6fe849dcf62e633e
+# Patch0-md5: fee956dfe6e1bb4bd0224ceb16338d9b
%endif
Source1: kernel.sysconfig
@@ -175,7 +175,7 @@ Source58: kernel-inittmpfs.config
#
http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.4-2.6.25-rc6.patch
Patch3:kernel-fbcondecor.patch
-Patch4:kernel-fbcon-margins.patch
+
Patch5:linux-wistron-amilo8210.patch
# netfilter related stuff mostly based on patch-o-matic-ng
@@ -685,7 +685,6 @@ sed -i 's/-Werror//' arch/alpha/kernel/Makefile
%if %{with fbcondecor}
%patch3 -p1
%endif
-%patch4 -p1
%patch5 -p1
## netfilter
diff --git a/kernel-fbcon-margins.patch b/kernel-fbcon-margins.patch
deleted file mode 100644
index fd77379..000
--- a/kernel-fbcon-margins.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-This fixes margin colour (colour used to clear margins - e.g. a half of line
-at the bottom of 100x37 console on 800x600 framebuffer).
-
-I don't know what was the intention behind using attr_bgcol_ec() here, but it
-caused using of background colour of last erase character to clear margins -
-which definitely isn't what we want...
-This patch changes margin colour to black (or colour 0 in palette modes).
-
- -- Jakub Bogusz qbo...@pld-linux.org
-
linux-2.6.9/drivers/video/console/bitblit.c.orig 2004-10-20
18:13:32.0 +0200
-+++ linux-2.6.9/drivers/video/console/bitblit.c2004-10-20
18:22:35.153056112 +0200
-@@ -206,7 +206,6 @@
- static void bit_clear_margins(struct vc_data *vc, struct fb_info *info,
- int bottom_only)
- {
-- int bgshift = (vc-vc_hi_font_mask) ? 13 : 12;
- unsigned int cw = vc-vc_font.width;
- unsigned int ch = vc-vc_font.height;
- unsigned int rw = info-var.xres - (vc-vc_cols*cw);
-@@ -215,7 +214,7 @@
- unsigned int bs = info-var.yres - bh;
- struct fb_fillrect region;
-
-- region.color = attr_bgcol_ec(bgshift, vc, info);
-+ region.color = 0;
- region.rop = ROP_COPY;
-
- if (rw !bottom_only) {
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 98d007d..d31cd75 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -1421,9 +1421,9 @@ diff -NurpP --minimal linux-3.4.103/drivers/net/tun.c
linux-3.4.103-vs2.3.3.9/dr
#include linux/virtio_net.h
#include linux/rcupdate.h
+#include linux/vs_network.h
+ #include net/ipv6.h
#include net/net_namespace.h
#include net/netns/generic.h
- #include net/rtnetlink.h
@@ -120,6 +121,7 @@ struct tun_struct {
unsigned intflags;
uid_t owner;
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/4795e0665ef007a22ea2c554edc90636f54aedc1
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: kernel: ERRORS: linux-3.4.tar.xz patch-3.4.106.xz
Request by: baggins kernel: undefined macro version Files fetched: 1 ALREADY GOT: http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.4.tar.xz 967f72983655e2479f951195953e8480 linux-3.4.tar.xz STORED: http://www.kernel.org/pub/linux/kernel/v3.x/patch-3.4.106.xz fee956dfe6e1bb4bd0224ceb16338d9b patch-3.4.106.xz Size: 1170396 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/nvidiabl] - that's how you separate userspace and kernel, is copy-pasting a few lines from template so hard,
commit 558c261f2a56a5f5ddf40769def028665052221d
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Sun Feb 8 12:21:00 2015 +0100
- that's how you separate userspace and kernel, is copy-pasting a few
lines from template so hard, glen?
- rel 4
nvidiabl.spec | 19 ++-
1 file changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/nvidiabl.spec b/nvidiabl.spec
index 0704fdf..e0f9995 100644
--- a/nvidiabl.spec
+++ b/nvidiabl.spec
@@ -5,6 +5,11 @@
%bcond_without userspace # don't build userspace programs
%bcond_without dkms# build dkms package
+%if 0%{?_pld_builder:1} %{with kernel} %{with userspace}
+%{error:kernel and userspace cannot be built at the same time on PLD builders}
+exit 1
+%endif
+
%if %{without userspace}
%undefine with_dkms
%endif
@@ -14,11 +19,11 @@
%define_duplicate_files_terminate_build0
-%definerel 3
+%definerel 4
%definepname nvidiabl
Summary: Linux driver for nVidia display back-lights
Summary(pl.UTF-8): Sterownik dla Linuksa do podświetlania wyświetlacza dla
kart firmy nVidia
-Name: %{pname}%{_alt_kernel}
+Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
Version: 0.87
Release: %{rel}%{?_pld_builder:@%{_kernel_ver_str}}
License: GPL v2+
@@ -29,7 +34,7 @@ Patch0: nvidiabl-dkmsconf.patch
# Source0-md5: e9418d3e500172d79680e44ad0f85743
URL: https://github.com/guillaumezin/nvidiabl
BuildRequires: rpmbuild(macros) = 1.701
-%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build =
3:2.6.20.2}
+%{?with_kernel:%{expand:%buildrequires_kernel
kernel%%{_alt_kernel}-module-build = 3:2.6.20.2}}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -116,10 +121,12 @@ Na komputerach firmy Apple ten sterownik pozwala na
dokładniejsze\
ustawianie jasności niż sterownik mbp_nvidia_bl i ogólnie jest\
zalecany.\
\
+%if %{with kernel}\
%files -n kernel%{_alt_kernel}-video-nvidiabl\
%defattr(644,root,root,755)\
/lib/modules/%{_kernel_ver}/misc/*.ko*\
%config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/%{pname}.conf\
+%endif\
\
%post -n kernel%{_alt_kernel}-video-nvidiabl\
%depmod %{_kernel_ver}\
@@ -133,21 +140,23 @@ zalecany.\
%install_kernel_modules -D installed -m nvidiabl -d misc\
%{nil}
-%{expand:%create_kernel_packages}
+%{?with_kernel:%{expand:%create_kernel_packages}}
%prep
%setup -qn %{pname}-%{version}
%patch0 -p1
%build
-%{expand:%build_kernel_packages}
+%{?with_kernel:%{expand:%build_kernel_packages}}
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/etc/modprobe.d
+%if %{with kernel}
cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/modprobe.d/%{pname}.conf
cp -a installed/* $RPM_BUILD_ROOT
+%endif
%if %{with dkms}
install -d $RPM_BUILD_ROOT%{_usrsrc}/%{pname}-%{version}-%{rel}
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nvidiabl.git/commitdiff/558c261f2a56a5f5ddf40769def028665052221d
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: kernel: linux-3.10.tar.xz patch-3.10.68.xz reiser4-for-3.10.patch.gz
Request by: baggins Files fetched: 1 ALREADY GOT: http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.10.tar.xz 4f25cd5bec5f8d5a7d935b3f2ccb8481 linux-3.10.tar.xz STORED: http://www.kernel.org/pub/linux/kernel/v3.x/patch-3.10.68.xz dfa635d7e8975f4c765d5fba7d1fad0d patch-3.10.68.xz Size: 1030404 bytes ALREADY GOT: http://downloads.sourceforge.net/reiser4/reiser4-for-linux-3.x/reiser4-for-3.10.patch.gz 5af1bdc286a88ef79268337c7ff17508 reiser4-for-3.10.patch.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
DISTFILES: kernel: linux-3.18.tar.xz patch-3.18.6.xz
Request by: baggins Files fetched: 1 ALREADY GOT: http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.tar.xz 9e854df51ca3fef8bfe566dbd7b89241 linux-3.18.tar.xz STORED: http://www.kernel.org/pub/linux/kernel/v3.x/patch-3.18.6.xz 30aa769974e64fd17a01724d1577a913 patch-3.18.6.xz Size: 191724 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/kernel] - 3.18.6
commit a0cda32d5c80f88dbd5015d11dc61e9b52a7bee7
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Sun Feb 8 13:18:13 2015 +0100
- 3.18.6
kernel.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 5155156..d118708 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -70,7 +70,7 @@
%definerel 1
%definebasever 3.18
-%definepostver .5
+%definepostver .6
# define this to '-%{basever}' for longterm branch
%defineversuffix %{nil}
@@ -119,7 +119,7 @@ Source0:
http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
# Source0-md5: 9e854df51ca3fef8bfe566dbd7b89241
%if %{postver} != .0
Patch0:
http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5: e8563b2feaa6c33d20d23ac7add9d385
+# Patch0-md5: 30aa769974e64fd17a01724d1577a913
%endif
Source1: kernel.sysconfig
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/a0cda32d5c80f88dbd5015d11dc61e9b52a7bee7
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/kernel/LINUX_3_14] - 3.14.32
commit 97aaa85a4366da84df40f8964b4f0398f38a1d20
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Sun Feb 8 13:15:21 2015 +0100
- 3.14.32
kernel.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 955db4e..28854d0 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -70,7 +70,7 @@
%definerel 1
%definebasever 3.14
-%definepostver .31
+%definepostver .32
%defineversuffix -%{basever}
@@ -115,7 +115,7 @@ Source0:
http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
# Source0-md5: b621207b3f6ecbb67db18b13258f8ea8
%if %{postver} != .0
Patch0:
http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5: be2e0f3f1ebc124940571ca6130dc478
+# Patch0-md5: 64519f60de7b12ef5bf2df4d323cee9c
%endif
Source1: kernel.sysconfig
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/97aaa85a4366da84df40f8964b4f0398f38a1d20
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: kernel: linux-3.14.tar.xz patch-3.14.32.xz
Request by: baggins Files fetched: 1 ALREADY GOT: http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.14.tar.xz b621207b3f6ecbb67db18b13258f8ea8 linux-3.14.tar.xz STORED: http://www.kernel.org/pub/linux/kernel/v3.x/patch-3.14.32.xz 64519f60de7b12ef5bf2df4d323cee9c patch-3.14.32.xz Size: 763728 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/qt4] - release 8 (by relup.sh)
commit d2c45e1d42c354f9c23a12b9a7fed2dea2f90e93
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Sun Feb 8 23:50:55 2015 +0100
- release 8 (by relup.sh)
qt4.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/qt4.spec b/qt4.spec
index 4ec4ae7..c03b823 100644
--- a/qt4.spec
+++ b/qt4.spec
@@ -60,7 +60,7 @@ Summary(pl.UTF-8):Biblioteka Qt do tworzenia GUI
Summary(pt_BR.UTF-8): Estrutura para rodar aplicações GUI Qt
Name: qt4
Version: 4.8.6
-Release: 7
+Release: 8
License: LGPL v2.1 or GPL v3.0
Group: X11/Libraries
Source0:
http://download.qt-project.org/official_releases/qt/4.8/%{version}/qt-everywhere-opensource-src-%{version}.tar.gz
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt4.git/commitdiff/d2c45e1d42c354f9c23a12b9a7fed2dea2f90e93
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/mesa-demos] - openvg is currently disabled in mesa - rel 2
commit b645648f2bef54509b75b59651341d5de82e1d4f
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Sun Feb 8 23:58:05 2015 +0100
- openvg is currently disabled in mesa
- rel 2
mesa-demos.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/mesa-demos.spec b/mesa-demos.spec
index 217f11b..7f618b5 100644
--- a/mesa-demos.spec
+++ b/mesa-demos.spec
@@ -3,14 +3,14 @@
%bcond_without egl # EGL utilities
%bcond_without gles1 # GLESv1 utilities
%bcond_without gles2 # GLESv2 utilities
-%bcond_without openvg # OpenVG utilities
+%bcond_withopenvg # OpenVG utilities
%bcond_without wayland # Wayland support
Summary: Mesa Demos source code
Summary(pl.UTF-8): Kod źródłowy programów demonstrujących dla bibliotek
Mesa
Name: mesa-demos
Version: 8.2.0
-Release: 1
+Release: 2
License: various (MIT, SGI, GPL - see copyright notes in sources)
Group: Development/Libraries
Source0:
ftp://ftp.freedesktop.org/pub/mesa/demos/%{version}/%{name}-%{version}.tar.bz2
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mesa-demos.git/commitdiff/b645648f2bef54509b75b59651341d5de82e1d4f
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/wicd] - R net-tools for ifconfig - rel 4
commit 264a66f0bfd73cdc918ee3b0725bab83209c9e4d
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 20 19:33:04 2015 +0100
- R net-tools for ifconfig
- rel 4
wicd.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/wicd.spec b/wicd.spec
index 9d68e8b..ed1188e 100644
--- a/wicd.spec
+++ b/wicd.spec
@@ -10,7 +10,7 @@ Summary(hu.UTF-8):Vezeték és vezeték néklküli hálózati
menedzser
Summary(pl.UTF-8): Zarządca sieci przewodowych i bezprzewodowych
Name: wicd
Version: 1.7.2.4
-Release: 3
+Release: 4
License: GPL v2+
Group: X11/Applications/Networking
Source0:
https://launchpad.net/wicd/1.7/%{version}/+download/wicd-%{version}.tar.gz
@@ -39,6 +39,7 @@ BuildRequires:sed = 4.0
Requires(post,preun): /sbin/chkconfig
Requires(post,preun,postun): systemd-units = 38
Requires: dbus(org.freedesktop.Notifications)
+Requires: net-tools
Requires: python-dbus
Requires: python-iwscan
Requires: python-pygobject
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wicd.git/commitdiff/264a66f0bfd73cdc918ee3b0725bab83209c9e4d
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/grub2] - add fixes for XFS support (patches from openSUSE) - rel 4
commit 2c79d729d4cbf15ad7e20542b6e5a62184613fa2
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Mon Jan 19 22:10:55 2015 +0100
- add fixes for XFS support (patches from openSUSE)
- rel 4
grub2-xfs-Add-helper-for-inode-size.patch | 76
...-inode-numbers-to-cpu-endianity-immediate.patch | 82
...-termination-loop-for-directory-iteration.patch | 32 ++
grub2-xfs-V5-filesystem-format-support.patch | 478 +
grub2.spec | 10 +-
5 files changed, 677 insertions(+), 1 deletion(-)
---
diff --git a/grub2.spec b/grub2.spec
index 0f1fb0d..81f2d17 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -47,7 +47,7 @@ Summary(pt_BR.UTF-8): Gerenciador de inicialização GRUB2
%definebetabeta2
Name: grub2
Version: 2.02
-Release: 0.%{beta}.3
+Release: 0.%{beta}.4
License: GPL v2
Group: Base
# git://git.savannah.gnu.org/grub.git
@@ -75,6 +75,10 @@ Patch10: ignore-kernel-symlinks.patch
Patch11: choose-preferred-initrd.patch
Patch12: %{name}-cfg.patch
Patch13: efi-net-fix.patch
+Patch14: grub2-xfs-Add-helper-for-inode-size.patch
+Patch15: grub2-xfs-Convert-inode-numbers-to-cpu-endianity-immediate.patch
+Patch16: grub2-xfs-Fix-termination-loop-for-directory-iteration.patch
+Patch17: grub2-xfs-V5-filesystem-format-support.patch
URL: http://www.gnu.org/software/grub/
BuildRequires: autoconf = 2.53
BuildRequires: automake = 1:1.11.1-1
@@ -302,6 +306,10 @@ Motyw starfield dla GRUB-a.
%patch11 -p1
%patch12 -p0
%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
# we don't have C.utf-8 and need an UTF-8 locale for build
sed -i -e 's/LC_ALL=C.UTF-8/LC_ALL=en_US.utf-8/g' po/Makefile* po/Rules*
diff --git a/grub2-xfs-Add-helper-for-inode-size.patch
b/grub2-xfs-Add-helper-for-inode-size.patch
new file mode 100644
index 000..47abde2
--- /dev/null
+++ b/grub2-xfs-Add-helper-for-inode-size.patch
@@ -0,0 +1,76 @@
+From 34231b28cbb6b2e10d7668c5b6d2432e8563bd1d Mon Sep 17 00:00:00 2001
+From: Jan Kara j...@suse.cz
+Date: Thu, 5 Jun 2014 20:56:21 +0200
+Subject: [PATCH 1/4] xfs: Add helper for inode size
+
+Signed-off-by: Jan Kara j...@suse.cz
+---
+ grub-core/fs/xfs.c | 17 +++--
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
+index 16ffd3f1ebd9..a2fc942707c1 100644
+--- a/grub-core/fs/xfs.c
b/grub-core/fs/xfs.c
+@@ -255,6 +255,11 @@ grub_xfs_inode_offset (struct grub_xfs_data *data,
+ data-sblock.log2_inode);
+ }
+
++static inline int
++grub_xfs_inode_size(struct grub_xfs_data *data)
++{
++ return 1 data-sblock.log2_inode;
++}
+
+ static grub_err_t
+ grub_xfs_read_inode (struct grub_xfs_data *data, grub_uint64_t ino,
+@@ -264,8 +269,8 @@ grub_xfs_read_inode (struct grub_xfs_data *data,
grub_uint64_t ino,
+ int offset = grub_xfs_inode_offset (data, ino);
+
+ /* Read the inode. */
+- if (grub_disk_read (data-disk, block, offset,
+-1 data-sblock.log2_inode, inode))
++ if (grub_disk_read (data-disk, block, offset, grub_xfs_inode_size(data),
++inode))
+ return grub_errno;
+
+ if (grub_strncmp ((char *) inode-magic, IN, 2))
+@@ -297,7 +302,7 @@ grub_xfs_read_block (grub_fshelp_node_t node,
grub_disk_addr_t fileblock)
+ if (node-inode.fork_offset)
+ recoffset = (node-inode.fork_offset - 1) / 2;
+ else
+- recoffset = ((1 node-data-sblock.log2_inode)
++ recoffset = (grub_xfs_inode_size(node-data)
+- ((char *) node-inode.data.btree.keys
+ - (char *) node-inode))
+ / (2 * sizeof (grub_uint64_t));
+@@ -458,7 +463,7 @@ static int iterate_dir_call_hook (grub_uint64_t ino, const
char *filename,
+
+ fdiro = grub_malloc (sizeof (struct grub_fshelp_node)
+ - sizeof (struct grub_xfs_inode)
+- + (1 ctx-diro-data-sblock.log2_inode) + 1);
++ + grub_xfs_inode_size(ctx-diro-data) + 1);
+ if (!fdiro)
+ {
+ grub_print_error ();
+@@ -684,7 +689,7 @@ grub_xfs_mount (grub_disk_t disk)
+ data = grub_realloc (data,
+ sizeof (struct grub_xfs_data)
+ - sizeof (struct grub_xfs_inode)
+- + (1 data-sblock.log2_inode) + 1);
++ + grub_xfs_inode_size(data) + 1);
+
+ if (! data)
+ goto fail;
+@@ -802,7 +807,7 @@ grub_xfs_open (struct grub_file *file, const char *name)
+ grub_memcpy (data-diropen, fdiro,
+ sizeof (struct grub_fshelp_node)
+ - sizeof (struct grub_xfs_inode)
+- + (1 data-sblock.log2_inode));
++ + grub_xfs_inode_size(data));
+ grub_free (fdiro);
+ }
+
+--
+1.8.1.4
+
diff --git a/grub2-xfs-Convert-inode-numbers-to-cpu-endianity-immediate.patch
[packages/google-talkplugin] - updated to 5.38.6.0
commit 28e0b9ffccac1c4352ac711dbd497f3a0f596b11
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Thu Jan 22 23:30:46 2015 +0100
- updated to 5.38.6.0
google-talkplugin.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/google-talkplugin.spec b/google-talkplugin.spec
index 68889b6..0f08d00 100644
--- a/google-talkplugin.spec
+++ b/google-talkplugin.spec
@@ -1,14 +1,14 @@
Summary: Call phones from Gmail
Name: google-talkplugin
-Version: 5.4.2.0
+Version: 5.38.6.0
Release: 1
License: Multiple, see http://chrome.google.com/
Group: Applications/Networking
Source0:
http://dl.google.com/linux/talkplugin/rpm/stable/i386/%{name}-%{version}-1.i386.rpm
-# NoSource0-md5: c015efe94a6639c437d6f52239eb6575
+# NoSource0-md5: 688df0620a710a75de0922e406522b84
NoSource: 0
Source1:
http://dl.google.com/linux/talkplugin/rpm/stable/x86_64/%{name}-%{version}-1.x86_64.rpm
-# NoSource1-md5: 7ef0bfd1f710404266ea0f6565537a03
+# NoSource1-md5: 904102bdcf2e709c017c7098bc71313d
NoSource: 1
URL: http://www.google.com/chat/video/
BuildRequires: rpmbuild(macros) = 1.453
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/google-talkplugin.git/commitdiff/28e0b9ffccac1c4352ac711dbd497f3a0f596b11
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: iwlwifi-7260-ucode: iwlwifi?action=AttachFiledo=gettarget=iwlwifi-7260-ucode-22.1.7.0.tgz iwlwifi?action=AttachFiledo=gettarget=iwlwifi-7260-ucode-22.24.8.0.tgz iwlwifi?action=AttachFil
Request by: baggins Files fetched: 2 ALREADY GOT: http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFiledo=gettarget=iwlwifi-7260-ucode-22.1.7.0.tgz 676447d12fe373d97b2db2b9849d297b iwlwifi?action=AttachFiledo=gettarget=iwlwifi-7260-ucode-22.1.7.0.tgz ALREADY GOT: http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFiledo=gettarget=iwlwifi-7260-ucode-22.24.8.0.tgz 6ac0a3fc936acdd2351866a7af2fe9f7 iwlwifi?action=AttachFiledo=gettarget=iwlwifi-7260-ucode-22.24.8.0.tgz STORED: http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFiledo=gettarget=iwlwifi-7260-ucode-25.228.9.0.tgz 1bccc66bd8d641c9de05c2c5846c23ee iwlwifi?action=AttachFiledo=gettarget=iwlwifi-7260-ucode-25.228.9.0.tgz Size: 348138 bytes STORED: http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFiledo=gettarget=iwlwifi-7260-ucode-23.11.10.0.tgz c59aa3f5395ccba356c2b09a38d21801 iwlwifi?action=AttachFiledo=gettarget=iwlwifi-7260-ucode-23.11.10.0.tgz Size: 347295 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/iwlwifi-7260-ucode] - add iwlwifi-7260-10.ucode
commit bf25997f672a9c32c7073a2d3bf0389d5827e4c0
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Sun Jan 18 17:10:53 2015 +0100
- add iwlwifi-7260-10.ucode
iwlwifi-7260-ucode.spec | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/iwlwifi-7260-ucode.spec b/iwlwifi-7260-ucode.spec
index 52d5d5c..ae6f1d8 100644
--- a/iwlwifi-7260-ucode.spec
+++ b/iwlwifi-7260-ucode.spec
@@ -11,7 +11,9 @@ Source0:
http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFiled
Source1:
http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFiledo=gettarget=iwlwifi-7260-ucode-22.24.8.0.tgz
# Source1-md5: 6ac0a3fc936acdd2351866a7af2fe9f7
Source2:
http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFiledo=gettarget=iwlwifi-7260-ucode-%{version}.tgz
-# Source2-md5: cfffe97083f57c50aeb030565b178aeb
+# Source2-md5: 1bccc66bd8d641c9de05c2c5846c23ee
+Source3:
http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFiledo=gettarget=iwlwifi-7260-ucode-23.11.10.0.tgz
+# Source3-md5: c59aa3f5395ccba356c2b09a38d21801
URL: http://www.intellinuxwireless.org/
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -43,7 +45,7 @@ pakietów, zapobiegające docieraniu do komputera pakietów
niepotrzebnych w danym trybie pracy urządzenia.
%prep
-%setup -q -c -a0 -a1 -a2
+%setup -q -c -a0 -a1 -a2 -a3
%install
rm -rf $RPM_BUILD_ROOT
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/iwlwifi-7260-ucode.git/commitdiff/bf25997f672a9c32c7073a2d3bf0389d5827e4c0
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: iwlwifi-7260-ucode: iwlwifi-7260-ucode-22.1.7.0.tgz iwlwifi-7260-ucode-22.24.8.0.tgz iwlwifi-7260-ucode-25.228.9.0.tgz iwlwifi-7260-ucode-23.11.10.0.tgz
Request by: baggins Files fetched: 4 STORED: no-url://iwlwifi-7260-ucode-22.1.7.0.tgz 676447d12fe373d97b2db2b9849d297b iwlwifi-7260-ucode-22.1.7.0.tgz Size: 341956 bytes STORED: no-url://iwlwifi-7260-ucode-22.24.8.0.tgz 6ac0a3fc936acdd2351866a7af2fe9f7 iwlwifi-7260-ucode-22.24.8.0.tgz Size: 346691 bytes STORED: no-url://iwlwifi-7260-ucode-25.228.9.0.tgz 1bccc66bd8d641c9de05c2c5846c23ee iwlwifi-7260-ucode-25.228.9.0.tgz Size: 348138 bytes STORED: no-url://iwlwifi-7260-ucode-23.11.10.0.tgz c59aa3f5395ccba356c2b09a38d21801 iwlwifi-7260-ucode-23.11.10.0.tgz Size: 347295 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/iwlwifi-7260-ucode] - use no-url for sources for avoid confusing fetchers from distfiles
commit 3298b55ac42b2674ea937459ff4e862a6d0b2cf9
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Sun Jan 18 17:22:15 2015 +0100
- use no-url for sources for avoid confusing fetchers from distfiles
iwlwifi-7260-ucode.spec | 12
1 file changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/iwlwifi-7260-ucode.spec b/iwlwifi-7260-ucode.spec
index 9565d38..e862db5 100644
--- a/iwlwifi-7260-ucode.spec
+++ b/iwlwifi-7260-ucode.spec
@@ -6,13 +6,17 @@ Version: 25.228.9.0
Release: 2
License: distributable
Group: Base/Kernel
-Source0:
http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFiledo=gettarget=iwlwifi-7260-ucode-22.1.7.0.tgz
+#Source0:
http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFiledo=gettarget=iwlwifi-7260-ucode-22.1.7.0.tgz
+Source0: iwlwifi-7260-ucode-22.1.7.0.tgz
# Source0-md5: 676447d12fe373d97b2db2b9849d297b
-Source1:
http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFiledo=gettarget=iwlwifi-7260-ucode-22.24.8.0.tgz
+#Source1:
http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFiledo=gettarget=iwlwifi-7260-ucode-22.24.8.0.tgz
+Source1: iwlwifi-7260-ucode-22.24.8.0.tgz
# Source1-md5: 6ac0a3fc936acdd2351866a7af2fe9f7
-Source2:
http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFiledo=gettarget=iwlwifi-7260-ucode-%{version}.tgz
+#Source2:
http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFiledo=gettarget=iwlwifi-7260-ucode-%{version}.tgz
+Source2: iwlwifi-7260-ucode-%{version}.tgz
# Source2-md5: 1bccc66bd8d641c9de05c2c5846c23ee
-Source3:
http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFiledo=gettarget=iwlwifi-7260-ucode-23.11.10.0.tgz
+#Source3:
http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFiledo=gettarget=iwlwifi-7260-ucode-23.11.10.0.tgz
+Source3: iwlwifi-7260-ucode-23.11.10.0.tgz
# Source3-md5: c59aa3f5395ccba356c2b09a38d21801
URL: http://www.intellinuxwireless.org/
BuildArch: noarch
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/iwlwifi-7260-ucode.git/commitdiff/3298b55ac42b2674ea937459ff4e862a6d0b2cf9
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/grub2-fonts-unifont] - updated font to 7.0.06 - updated build to current grub2 expectations
commit 691cbc019b06bae3c424a2340e3eb2dd40ef3c22
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Thu Jan 22 21:50:12 2015 +0100
- updated font to 7.0.06
- updated build to current grub2 expectations
grub2-fonts-unifont.spec | 42 +-
simple_convert | 3 ---
2 files changed, 9 insertions(+), 36 deletions(-)
---
diff --git a/grub2-fonts-unifont.spec b/grub2-fonts-unifont.spec
index aa58767..5a0b41d 100644
--- a/grub2-fonts-unifont.spec
+++ b/grub2-fonts-unifont.spec
@@ -1,22 +1,15 @@
# TODO - find and test other unicode fonts for grub2.
-%define _enable_debug_packages 0
-%define _snap 20080907
-%define_sizes {12 18 24 32}
-%define _fontname unifont
-%define _destdir /grub2/fonts
Summary: Unifont font for grub2 gfxterm mode
Summary(pl.UTF-8): Czcionka unifont do trybu graficznego bootloadera grub2
-Name: grub2-fonts-%{_fontname}
-Version: 5.1
+Name: grub2-fonts-unifont
+Version: 7.0.06
Release: 1
License: GNU GPL v.2
Group: Fonts
-Source0: http://unifoundry.com/%{_fontname}-%{version}.%{_snap}.ttf.gz
-# Source0-md5: 708a693e340902779ec9ad13acae279a
-Source1: simple_convert
+Source0:
http://unifoundry.com/pub/unifont-%{version}/font-builds/unifont-%{version}.ttf
+# Source0-md5: a3f68517ddc92a4a2ea26f07c75ad7a9
URL: http://unifoundry.com/unifont.html
-BuildRequires: /usr/bin/ttf2bdf
BuildRequires: grub2
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -30,37 +23,20 @@ Czcionka unifont do trybu graficznego bootloadera grub2.
%prep
%setup -q -cT %{name}-%{version}
install %{SOURCE0} .
-install %{SOURCE1} .
-gzip -d %{_fontname}-%{version}.%{_snap}.ttf.gz
-mv %{_fontname}-%{version}.%{_snap}.ttf %{_fontname}.ttf
%build
-for i in %{_sizes}; do
- # /usr/bin/ttf2bdf -v -r 75 -p $i -o %{_fontname}$i.bdf -t %{_fontname}
%{_fontname}.ttf
- #/sbin/grub-mkfont --output=%{_fontname}$i.pf2 %{_fontname}$i.bdf
- sh simple_convert $i %{_fontname}
-done
+/sbin/grub-mkfont --output=unicode.pf2 unifont-%{version}.ttf
%install
rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/boot/grub/fonts
-install -d $RPM_BUILD_ROOT%{_datadir}%{_destdir}
-#gzip -9 *.pf2
-cp *.pf2* $RPM_BUILD_ROOT%{_datadir}%{_destdir}
+cp *.pf2 $RPM_BUILD_ROOT/boot/grub/fonts
%clean
rm -rf $RPM_BUILD_ROOT
-%post
-echo These are (%{_sizes})pt/75dpi fonts.
-Copy one somewhere under /boot location and set in grub.cfg.
-To get other sizes rebuild package setting desired _sizes.
-
-#%post -l pl.UTF-8
-#echo To są czcionki o wielkościach (%{_sizes})pt/75dpi.
-#Skopiuj którąś do katalogu /boot i wskaż w grub.cfg.
-#Żeby uzyskać inne wielkości przebuduj pakiet zmieniając parametr _sizes.
-
%files
%defattr(644,root,root,755)
-%{_datadir}%{_destdir}
+%dir /boot/grub/fonts
+/boot/grub/fonts/unicode.pf2
diff --git a/simple_convert b/simple_convert
deleted file mode 100644
index dd45580..000
--- a/simple_convert
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-/usr/bin/ttf2bdf -v -r 75 -p $1 -o $2$1.bdf -t $2 $2.ttf
-/sbin/grub-mkfont --output=$2$1.pf2 $2$1.bdf
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/grub2-fonts-unifont.git/commitdiff/691cbc019b06bae3c424a2340e3eb2dd40ef3c22
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: grub2-fonts-unifont: unifont-7.0.06.ttf
Request by: baggins Files fetched: 1 STORED: http://unifoundry.com/pub/unifont-7.0.06/font-builds/unifont-7.0.06.ttf a3f68517ddc92a4a2ea26f07c75ad7a9 unifont-7.0.06.ttf Size: 12303504 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/libcmis] Created branch libcmis-0.4
The branch 'libcmis-0.4' was created. Summary of new commits: 65494f7... - rel 4 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/libkolabxml] - rebuild with boost 1.57.0 - release 9 (by relup.sh)
commit 6957337b62e58e41fd4330bdc4181a94550b4628
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Feb 17 23:44:29 2015 +0100
- rebuild with boost 1.57.0
- release 9 (by relup.sh)
libkolabxml.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/libkolabxml.spec b/libkolabxml.spec
index 48e8b09..da30658 100644
--- a/libkolabxml.spec
+++ b/libkolabxml.spec
@@ -8,7 +8,7 @@
Summary: Kolab XML format collection parser library
Name: libkolabxml
Version: 1.0.1
-Release: 8
+Release: 9
License: LGPL v3+
Group: Libraries
Source0:
http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libkolabxml.git/commitdiff/6957337b62e58e41fd4330bdc4181a94550b4628
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/CEGUI] - rebuild with boost 1.57.0 - release 3 (by relup.sh)
commit 644389139e44ef0f3b710734abab68c43eb54571
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Feb 17 23:44:24 2015 +0100
- rebuild with boost 1.57.0
- release 3 (by relup.sh)
CEGUI.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/CEGUI.spec b/CEGUI.spec
index 5bf6058..5732e09 100644
--- a/CEGUI.spec
+++ b/CEGUI.spec
@@ -10,7 +10,7 @@ Summary: CEGUI - a free library providing windowing and
widgets
Summary(pl.UTF-8): CEGUI - wolnodostępna biblioteka zapewniającą okienka i
widgety
Name: CEGUI
Version: 0.8.4
-Release: 2
+Release: 3
License: LGPL v2.1+ (with MIT parts)
Group: Libraries
Source0:
http://downloads.sourceforge.net/crayzedsgui/cegui-%{version}.tar.bz2
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/CEGUI.git/commitdiff/644389139e44ef0f3b710734abab68c43eb54571
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/libcmis/libcmis-0.4] - rel 4
commit 65494f7b0edbd93530e13a157afc514b28a1d608
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Feb 17 23:42:32 2015 +0100
- rel 4
libcmis.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/libcmis.spec b/libcmis.spec
index 35d78ed..587aafa 100644
--- a/libcmis.spec
+++ b/libcmis.spec
@@ -6,7 +6,7 @@ Summary:A C++ client library for the CMIS interface
Summary(pl.UTF-8): Biblioteka klienta C++ dla inferfejsu CMIS
Name: libcmis
Version: 0.4.1
-Release: 3
+Release: 4
License: GPL v2+ or LGPL v2+ or MPL v1.1
Group: Libraries
Source0:
http://downloads.sourceforge.net/libcmis/%{name}-%{version}.tar.gz
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libcmis.git/commitdiff/65494f7b0edbd93530e13a157afc514b28a1d608
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/liborcus] - rebuild with boost 1.57.0 - release 3 (by relup.sh)
commit 07b9a519620c6802f0407b88b5425a672d19610e Author: Jan Rękorajski bagg...@pld-linux.org Date: Tue Feb 17 23:44:35 2015 +0100 - rebuild with boost 1.57.0 - release 3 (by relup.sh) liborcus.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/liborcus.spec b/liborcus.spec index e159548..a86d748 100644 --- a/liborcus.spec +++ b/liborcus.spec @@ -8,7 +8,7 @@ Summary:Standalone file import filter library for spreadsheet documents Summary(pl.UTF-8): Biblioteka samodzielnego filtra importującego pliki dla arkuszy kalkulacyjnych Name: liborcus Version: 0.7.0 -Release: 2 +Release: 3 License: MIT Group: Libraries #Source0Download: http://gitorious.org/orcus/pages/Download gitweb: http://git.pld-linux.org/gitweb.cgi/packages/liborcus.git/commitdiff/07b9a519620c6802f0407b88b5425a672d19610e ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/hhvm] - rebuild with boost 1.57.0 - release 2 (by relup.sh)
commit 93b979fddd0572adcb9d7a9ef1ba8e6eaa0d485e
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Mon Feb 16 16:52:19 2015 +0100
- rebuild with boost 1.57.0
- release 2 (by relup.sh)
hhvm.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/hhvm.spec b/hhvm.spec
index 943d4e1..d65233d 100644
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -32,7 +32,7 @@ Name: hhvm
# we prefer LTS versions
# see http://hhvm.com/blog/6083/hhvm-long-term-support
Version: 3.3.2
-Release: 1
+Release: 2
License: PHP 3.01 and BSD
Group: Development/Languages
Source0: https://github.com/facebook/hhvm/archive/HHVM-%{version}.tar.gz
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hhvm.git/commitdiff/93b979fddd0572adcb9d7a9ef1ba8e6eaa0d485e
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/hhvm/hhvm-3.2] - rebuild with boost 1.57.0 - release 10 (by relup.sh)
commit 506537e6ae6f9f8432b4f036cde393adba4b0168
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Mon Feb 16 16:52:01 2015 +0100
- rebuild with boost 1.57.0
- release 10 (by relup.sh)
hhvm.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/hhvm.spec b/hhvm.spec
index b120e51..58c2466 100644
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -10,7 +10,7 @@
Summary: Virtual Machine, Runtime, and JIT for PHP
Name: hhvm
Version: 3.2.0
-Release: 9
+Release: 10
License: PHP 3.01
Group: Development/Languages
Source0: https://github.com/facebook/hhvm/archive/HHVM-%{version}.tar.gz
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hhvm.git/commitdiff/506537e6ae6f9f8432b4f036cde393adba4b0168
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/libcmis/libcmis-0.4] - release 5 (by relup.sh)
commit dbccedd284308d7ec42483ab6b810e911d7bb59f
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Wed Feb 18 07:28:15 2015 +0100
- release 5 (by relup.sh)
libcmis.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/libcmis.spec b/libcmis.spec
index 587aafa..8462c71 100644
--- a/libcmis.spec
+++ b/libcmis.spec
@@ -6,7 +6,7 @@ Summary:A C++ client library for the CMIS interface
Summary(pl.UTF-8): Biblioteka klienta C++ dla inferfejsu CMIS
Name: libcmis
Version: 0.4.1
-Release: 4
+Release: 5
License: GPL v2+ or LGPL v2+ or MPL v1.1
Group: Libraries
Source0:
http://downloads.sourceforge.net/libcmis/%{name}-%{version}.tar.gz
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libcmis.git/commitdiff/dbccedd284308d7ec42483ab6b810e911d7bb59f
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/gnuradio] - release 6 (by relup.sh)
commit 47b7b463d914e0ad63223e8739c4321aefa597e3
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Wed Feb 18 07:27:39 2015 +0100
- release 6 (by relup.sh)
gnuradio.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/gnuradio.spec b/gnuradio.spec
index e5736d2..6616087 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -6,7 +6,7 @@
Summary: Software defined radio framework
Name: gnuradio
Version: 3.7.2.1
-Release: 5
+Release: 6
License: GPL v3
Group: Applications/Engineering
Source0: http://gnuradio.org/releases/gnuradio/%{name}-%{version}.tar.gz
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnuradio.git/commitdiff/47b7b463d914e0ad63223e8739c4321aefa597e3
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/povray] - release 8 (by relup.sh)
commit 041211e3e7f2c79e24c5b907f1bd3d05c106ca79
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Wed Feb 18 08:11:37 2015 +0100
- release 8 (by relup.sh)
povray.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/povray.spec b/povray.spec
index bb455f9..1f4acd3 100644
--- a/povray.spec
+++ b/povray.spec
@@ -6,7 +6,7 @@
#
%define_rc RC7
%define_src_pov_ver3.7.0.%{_rc}
-%definerel 7
+%definerel 8
Summary: Persistence of Vision Ray Tracer
Summary(pl.UTF-8): Persistence of Vision Ray Tracer
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/povray.git/commitdiff/041211e3e7f2c79e24c5b907f1bd3d05c106ca79
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/hugin] - upstream fix for building with boost 1.57.0
commit 5173d7fcc8f8388da85e04d649b37c2a42634525
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Wed Feb 18 18:23:38 2015 +0100
- upstream fix for building with boost 1.57.0
boost-1.57.0.patch | 26 ++
hugin.spec | 2 ++
2 files changed, 28 insertions(+)
---
diff --git a/hugin.spec b/hugin.spec
index 72dd13b..46c7b01 100644
--- a/hugin.spec
+++ b/hugin.spec
@@ -10,6 +10,7 @@ Source0:
http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
Patch0:%{name}-pl.po-update.patch
Patch1:%{name}-cppflags.patch
Patch2:%{name}-boost.patch
+Patch3:boost-1.57.0.patch
URL: http://hugin.sourceforge.net/
BuildRequires: OpenEXR-devel
BuildRequires: OpenGL-glut-devel
@@ -66,6 +67,7 @@ i ekspozycji, więc warto zainstalować pakiet enblend-enfuse.
#%patch0 -p1
%patch1 -p0
%patch2 -p1
+%patch3 -p1
mv -f src/translations/{cs_CZ,cs}.po
diff --git a/boost-1.57.0.patch b/boost-1.57.0.patch
new file mode 100644
index 000..ef8ef95
--- /dev/null
+++ b/boost-1.57.0.patch
@@ -0,0 +1,26 @@
+From 06ccdfee76fe487a141b95848d1c866890f15d88 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras evange...@foutrelis.com
+Date: Thu, 6 Nov 2014 09:19:26 +0200
+Subject: [PATCH] Add missing include to signals2/trackable.hpp
+
+boost::weak_ptr started being used in commit a0bf2d1 (Disconnect slots
+associated with signals2::trackable immediately) but the matching header
+wasn't included.
+
+https://svn.boost.org/trac/boost/ticket/10100#comment:7
+---
+ include/boost/signals2/trackable.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/boost/signals2/trackable.hpp
b/include/boost/signals2/trackable.hpp
+index dba001d..64e8489 100644
+--- a/include/boost/signals2/trackable.hpp
b/include/boost/signals2/trackable.hpp
+@@ -18,6 +18,7 @@
+
+ #include boost/assert.hpp
+ #include boost/shared_ptr.hpp
++#include boost/weak_ptr.hpp
+
+ namespace boost {
+ namespace signals2 {
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hugin.git/commitdiff/5173d7fcc8f8388da85e04d649b37c2a42634525
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/grive] - fix json-c include paths - rebuild with boost 1.57.0 - rel 8
commit 54a0f00ea7a139aec1cb05e8a834f7353b3ce9da
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Wed Feb 18 18:13:01 2015 +0100
- fix json-c include paths
- rebuild with boost 1.57.0
- rel 8
grive.spec | 2 +-
json-c.patch | 13 +
2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/grive.spec b/grive.spec
index ee9eb13..726156d 100644
--- a/grive.spec
+++ b/grive.spec
@@ -2,7 +2,7 @@
# %(c=%{commit}; echo ${c:0:7})
%defineshortcommit 27817e8
%definecdate 20130702
-%definerel 7
+%definerel 8
Summary: An open source Linux client for Google Drive
Name: grive
Version: 0.3.0
diff --git a/json-c.patch b/json-c.patch
index ea43775..4cd3c81 100644
--- a/json-c.patch
+++ b/json-c.patch
@@ -11,3 +11,16 @@
IF (JSONC_INCLUDE_DIR AND JSONC_LIBRARY)
SET(JSONC_FOUND TRUE)
+---
grive-27817e835fe115ebbda5410ec904aa49a2ad01f1/libgrive/src/protocol/Json.cc~
2013-05-02 18:40:04.0 +0200
grive-27817e835fe115ebbda5410ec904aa49a2ad01f1/libgrive/src/protocol/Json.cc
2015-02-18 18:11:40.664989070 +0100
+@@ -29,8 +29,8 @@
+ #pragma warning(push)
+ #pragma warning(disable: 4005)
+ #endif
+-#include json/json_tokener.h
+-#include json/linkhash.h
++#include json-c/json_tokener.h
++#include json-c/linkhash.h
+ #ifdef _MSC_VER
+ #pragma warning(pop)
+ #endif
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/grive.git/commitdiff/54a0f00ea7a139aec1cb05e8a834f7353b3ce9da
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/boost] - build bython3 first to avoid it silently overwriting python2 library - rel 3
commit 6cb66fff62ac649bc7103ea65847b01ae205705b
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Wed Feb 18 19:02:18 2015 +0100
- build bython3 first to avoid it silently overwriting python2 library
- rel 3
boost.spec | 15 +++
1 file changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/boost.spec b/boost.spec
index 091f277..70da06f 100644
--- a/boost.spec
+++ b/boost.spec
@@ -13,7 +13,7 @@ Summary: The Boost C++ Libraries
Summary(pl.UTF-8): Biblioteki C++ Boost
Name: boost
Version: 1.57.0
-Release: 2
+Release: 3
License: Boost Software License and others
Group: Libraries
Source0: http://downloads.sourceforge.net/boost/%{name}_%{fver}.tar.bz2
@@ -508,11 +508,10 @@ ICU_PATH=%{_prefix} \
link=static,shared \
threading=multi
-
-%if %{with python2}
-echo using python : %{py_ver} : %{py_prefix} : %{py_incdir} ;
project-config.jam
+%if %{with python3}
+echo using python : %{py3_ver}m : %{py3_prefix} : %{py3_incdir} ;
project-config.jam
./b2 \
- --with-python python=%{py_ver} \
+ --with-python python=%{py3_ver}m \
-d2 --toolset=gcc \
variant=release \
debug-symbols=on \
@@ -521,10 +520,10 @@ echo using python : %{py_ver} : %{py_prefix} :
%{py_incdir} ; project-confi
threading=multi
%endif
-%if %{with python3}
-echo using python : %{py3_ver}m : %{py3_prefix} : %{py3_incdir} ;
project-config.jam
+%if %{with python2}
+echo using python : %{py_ver} : %{py_prefix} : %{py_incdir} ;
project-config.jam
./b2 \
- --with-python python=%{py3_ver}m \
+ --with-python python=%{py_ver} \
-d2 --toolset=gcc \
variant=release \
debug-symbols=on \
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/boost.git/commitdiff/6cb66fff62ac649bc7103ea65847b01ae205705b
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/lttng-ust] - fix systemtap R for devel package - rel 2
commit 28705e5d99ff6b77b32296a2dce1359fa54b9a89
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Wed Feb 18 18:17:37 2015 +0100
- fix systemtap R for devel package
- rel 2
lttng-ust.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/lttng-ust.spec b/lttng-ust.spec
index eb05d90..24aaee7 100644
--- a/lttng-ust.spec
+++ b/lttng-ust.spec
@@ -7,7 +7,7 @@ Summary:LTTng Userspace Tracer
Summary(pl.UTF-8): LTTng Userspace Tracer - narzędzia LTTng do śledzenia
przestrzeni użytkownika
Name: lttng-ust
Version: 2.6.0
-Release: 1
+Release: 2
License: LGPL v2.1 (library), MIT (headers), GPL v2 (programs)
Group: Libraries
Source0: http://lttng.org/files/lttng-ust/%{name}-%{version}.tar.bz2
@@ -46,6 +46,7 @@ Summary(pl.UTF-8):Pliki nagłówkowe bibliotek LTTNG-UST
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: userspace-rcu-devel = 0.7.2
+%{?with_systemtap:Requires:systemtap-sdt-devel}
%description devel
Header files for LTTNG-UST libraries.
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lttng-ust.git/commitdiff/28705e5d99ff6b77b32296a2dce1359fa54b9a89
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/hugin] - proper boost fix
commit 7174afd227e2217cba22ec428faf8d33701f627d
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Wed Feb 18 20:20:09 2015 +0100
- proper boost fix
boost-1.57.0.patch | 34 +-
1 file changed, 9 insertions(+), 25 deletions(-)
---
diff --git a/boost-1.57.0.patch b/boost-1.57.0.patch
index ef8ef95..6ab3541 100644
--- a/boost-1.57.0.patch
+++ b/boost-1.57.0.patch
@@ -1,26 +1,10 @@
-From 06ccdfee76fe487a141b95848d1c866890f15d88 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras evange...@foutrelis.com
-Date: Thu, 6 Nov 2014 09:19:26 +0200
-Subject: [PATCH] Add missing include to signals2/trackable.hpp
-
-boost::weak_ptr started being used in commit a0bf2d1 (Disconnect slots
-associated with signals2::trackable immediately) but the matching header
-wasn't included.
-
-https://svn.boost.org/trac/boost/ticket/10100#comment:7
- include/boost/signals2/trackable.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/boost/signals2/trackable.hpp
b/include/boost/signals2/trackable.hpp
-index dba001d..64e8489 100644
a/include/boost/signals2/trackable.hpp
-+++ b/include/boost/signals2/trackable.hpp
-@@ -18,6 +18,7 @@
-
- #include boost/assert.hpp
- #include boost/shared_ptr.hpp
+--- hugin-2014.0.0/src/hugin1/hugin/TextureManager.h~ 2014-10-08
20:19:19.0 +0200
hugin-2014.0.0/src/hugin1/hugin/TextureManager.h 2015-02-18
20:17:32.275040262 +0100
+@@ -42,6 +42,7 @@
+ #include map
+ #include boost/version.hpp
+ #if BOOST_VERSION=105400
+#include boost/weak_ptr.hpp
-
- namespace boost {
- namespace signals2 {
+ #include boost/signals2/trackable.hpp
+ namespace boostSignal=boost::signals2;
+ #else
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hugin.git/commitdiff/7174afd227e2217cba22ec428faf8d33701f627d
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/mongodb] - fix for 'swap' is not a member of 'std' in gcc 4
commit b9095f1f74522d7f18b690d4ad86e5a0b67c
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Wed Feb 18 19:26:15 2015 +0100
- fix for 'swap' is not a member of 'std' in gcc 4
gcc4.patch | 10 ++
mongodb.spec | 2 ++
2 files changed, 12 insertions(+)
---
diff --git a/mongodb.spec b/mongodb.spec
index c0c5ac0..f13454b 100644
--- a/mongodb.spec
+++ b/mongodb.spec
@@ -19,6 +19,7 @@ Patch1: %{name}-system-libs.patch
Patch2:boost-1.50.patch
Patch3:%{name}-install.patch
Patch4:%{name}-shared.patch
+Patch5:gcc4.patch
URL: http://www.mongodb.org/
BuildRequires: boost-devel = 1.50
BuildRequires: libpcap-devel
@@ -145,6 +146,7 @@ konfiguracji oraz skrypty init.d.
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
# Fix permissions
find -type f -executable | xargs chmod a-x
diff --git a/gcc4.patch b/gcc4.patch
new file mode 100644
index 000..3083919
--- /dev/null
+++ b/gcc4.patch
@@ -0,0 +1,10 @@
+--- mongodb-src-r2.2.4/src/mongo/shell/linenoise_utf8.h~ 2013-04-01
04:41:49.0 +0200
mongodb-src-r2.2.4/src/mongo/shell/linenoise_utf8.h2015-02-18
19:25:42.158352512 +0100
+@@ -17,6 +17,7 @@
+
+ #include boost/smart_ptr/scoped_array.hpp
+ #include string.h
++#include algorithm
+
+ namespace linenoise_utf8 {
+
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mongodb.git/commitdiff/b9095f1f74522d7f18b690d4ad86e5a0b67c
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/mkvtoolnix] - do BR rake if it's needed
commit d6e4adafb3f4df88b69df740cbffd27577eaf99a
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Wed Feb 18 19:27:52 2015 +0100
- do BR rake if it's needed
mkvtoolnix.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/mkvtoolnix.spec b/mkvtoolnix.spec
index 3988006..d14b9d1 100644
--- a/mkvtoolnix.spec
+++ b/mkvtoolnix.spec
@@ -35,7 +35,7 @@ BuildRequires:pcre-cxx-devel
BuildRequires: pkgconfig
BuildRequires: qt5-build = 4.3.3-3
%endif
-# required by rake
+BuildRequires: rake
BuildRequires: ruby-modules
%{?with_wx:BuildRequires: wxGTK2-unicode-devel = 2.6.0}
BuildRequires: zlib-devel
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mkvtoolnix.git/commitdiff/d6e4adafb3f4df88b69df740cbffd27577eaf99a
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ceph] - rebuild with boost 1.57.0 - release 2 (by relup.sh)
commit 31b1a8f210257f157ba2ac245be1f235c9ecd254
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Wed Feb 18 20:09:49 2015 +0100
- rebuild with boost 1.57.0
- release 2 (by relup.sh)
ceph.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/ceph.spec b/ceph.spec
index 310e86e..d1505cb 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -16,7 +16,7 @@ Summary: User space components of the Ceph file system
Summary(pl.UTF-8): Działające w przestrzeni użytkownika elementy systemu
plików Ceph
Name: ceph
Version: 0.92
-Release: 1
+Release: 2
License: LGPL v2.1 (libraries), GPL v2 (some programs)
Group: Base
Source0: http://ceph.com/download/%{name}-%{version}.tar.bz2
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ceph.git/commitdiff/31b1a8f210257f157ba2ac245be1f235c9ecd254
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/vtk] - fix building with current gcc - update netcdf BRs - rel 7
commit df99c936b25a08cb21514360f10a01b0a5fe8423
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Wed Feb 18 20:08:16 2015 +0100
- fix building with current gcc
- update netcdf BRs
- rel 7
conflicting-types.patch | 22 ++
vtk.spec| 8 +---
2 files changed, 27 insertions(+), 3 deletions(-)
---
diff --git a/vtk.spec b/vtk.spec
index 87344be..8c38d37 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -16,7 +16,7 @@ Summary: Toolkit for 3D computer graphics, image
processing, and visualization
Summary(pl.UTF-8): Zestaw narzędzi do trójwymiarowej grafiki,
przetwarzania obrazu i wizualizacji
Name: vtk
Version: 6.1.0
-Release: 6
+Release: 7
License: BSD
Group: Libraries
Source0: http://www.vtk.org/files/release/6.1/VTK-%{version}.tar.gz
@@ -26,6 +26,7 @@ Source1:
http://www.vtk.org/files/release/6.1/VTKData-%{version}.tar.gz
Patch0:%{name}-system-libs.patch
Patch1:%{name}-install.patch
Patch2:%{name}-chemistry.patch
+Patch3:conflicting-types.patch
URL: http://www.vtk.org/
%{?with_OSMesa:BuildRequires: Mesa-libOSMesa-devel}
BuildRequires: OpenGL-GLX-devel
@@ -64,7 +65,7 @@ BuildRequires:libtiff-devel
BuildRequires: libxml2-devel = 2
BuildRequires: motif-devel
BuildRequires: mysql-devel
-BuildRequires: netcdf-devel = 4
+BuildRequires: netcdf-cxx-devel = 4
# some code using it exists (Domains/Chemistry), but is not included in
cmakefiles
#BuildRequires:openqube-devel
BuildRequires: perl-base
@@ -314,6 +315,7 @@ potrzebne do uruchamiania różnych przykładów z pakietu
vtk-examples.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
# Replace relative path ../../../VTKData with destination filesystem path
grep -Erl '(\.\./)+VTKData' Examples | xargs \
@@ -333,7 +335,7 @@ export CXXFLAGS=%{rpmcxxflags} -D_UNICODE
export JAVA_HOME=%{java_home}
%endif
-mkdir build
+mkdir -p build
cd build
%cmake .. \
-DBUILD_DOCUMENTATION:BOOL=ON \
diff --git a/conflicting-types.patch b/conflicting-types.patch
new file mode 100644
index 000..050f711
--- /dev/null
+++ b/conflicting-types.patch
@@ -0,0 +1,22 @@
+--- VTK-6.1.0/Rendering/FreeType/vtkFreeTypeTools.cxx.orig 2015-02-18
19:39:39.428358188 +0100
VTK-6.1.0/Rendering/FreeType/vtkFreeTypeTools.cxx 2015-02-18
19:40:48.241691988 +0100
+@@ -1186,7 +1186,7 @@
+ if (bitmap)
+ {
+ metaData.ascent = std::max(bitmapGlyph-top - 1, metaData.ascent);
+- metaData.descent = std::min(-(bitmap-rows - (bitmapGlyph-top - 1)),
++ metaData.descent = std::min(-((int)bitmap-rows -
((int)bitmapGlyph-top - 1)),
+ metaData.descent);
+ }
+ ++heightString;
+@@ -1951,8 +1951,8 @@
+ if (bitmap)
+ {
+ bbox[0] = std::min(bbox[0], pen[0] + bitmapGlyph-left);
+- bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph-left + bitmap-width);
+- bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph-top - 1 -
bitmap-rows);
++ bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph-left +
(int)bitmap-width);
++ bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph-top - 1 -
(int)bitmap-rows);
+ bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph-top - 1);
+ }
+ else
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vtk.git/commitdiff/df99c936b25a08cb21514360f10a01b0a5fe8423
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/hugin] - release 2 (by relup.sh)
commit d6231d09240bb619f3ce6593141b691509c24fc8
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Wed Feb 18 20:20:51 2015 +0100
- release 2 (by relup.sh)
hugin.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/hugin.spec b/hugin.spec
index 46c7b01..d314e35 100644
--- a/hugin.spec
+++ b/hugin.spec
@@ -2,7 +2,7 @@ Summary:Toolchain to create panoramic images
Summary(pl.UTF-8): Zestaw narzędzi do tworzenia panoramicznych zdjęć
Name: hugin
Version: 2014.0.0
-Release: 1
+Release: 2
License: GPL v2+
Group: X11/Applications/Graphics
Source0:
http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hugin.git/commitdiff/d6231d09240bb619f3ce6593141b691509c24fc8
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/avogadro] - rebuild with boost 1.57.0 - release 10 (by relup.sh)
commit 8c25334f4cba137437c4cfa3414007f7855020fb
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Thu Feb 19 08:14:07 2015 +0100
- rebuild with boost 1.57.0
- release 10 (by relup.sh)
avogadro.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/avogadro.spec b/avogadro.spec
index 2625c09..e4fcd10 100644
--- a/avogadro.spec
+++ b/avogadro.spec
@@ -1,7 +1,7 @@
Summary: An advanced molecular editor for chemical purposes
Name: avogadro
Version: 1.0.3
-Release: 9
+Release: 10
License: GPL v2
Group: Applications/Editors
Source0:
http://downloads.sourceforge.net/avogadro/%{name}-%{version}.tar.bz2
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/avogadro.git/commitdiff/8c25334f4cba137437c4cfa3414007f7855020fb
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/mkvtoolnix] - rebuild with boost 1.57.0 - release 2 (by relup.sh)
commit 7b93532161af24f0a3eb8de6371e6d9e4bd0f96a
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Thu Feb 19 08:55:10 2015 +0100
- rebuild with boost 1.57.0
- release 2 (by relup.sh)
mkvtoolnix.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/mkvtoolnix.spec b/mkvtoolnix.spec
index 01f3870..af8ab80 100644
--- a/mkvtoolnix.spec
+++ b/mkvtoolnix.spec
@@ -11,7 +11,7 @@ Summary: Matroska video utilities
Summary(pl.UTF-8): Narzędzia do filmów w formacie Matroska
Name: mkvtoolnix
Version: 7.3.0
-Release: 1
+Release: 2
License: GPL v2
Group: Applications/Multimedia
Source0:
http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.xz
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mkvtoolnix.git/commitdiff/7b93532161af24f0a3eb8de6371e6d9e4bd0f96a
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/mongodb] - rebuild with boost 1.57.0 - release 4 (by relup.sh)
commit ebdae5b0338ac0ebe8efd91a81e9c73f17940048
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Thu Feb 19 08:14:17 2015 +0100
- rebuild with boost 1.57.0
- release 4 (by relup.sh)
mongodb.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/mongodb.spec b/mongodb.spec
index f13454b..7355ed6 100644
--- a/mongodb.spec
+++ b/mongodb.spec
@@ -5,7 +5,7 @@ Summary:MongoDB client shell and tools
Summary(pl.UTF-8): Powłoka kliencka i narzędzia dla bazy danych MongoDB
Name: mongodb
Version: 2.2.4
-Release: 3
+Release: 4
License: AGPL v3
Group: Applications/Databases
Source0: http://downloads.mongodb.org/src/%{name}-src-r%{version}.tar.gz
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mongodb.git/commitdiff/ebdae5b0338ac0ebe8efd91a81e9c73f17940048
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/kde4-kig] - rebuild with boost 1.57.0 - release 2 (by relup.sh)
commit fb87aba20b04ef647419bf79d1b60c38335de4ce
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Thu Feb 19 08:13:55 2015 +0100
- rebuild with boost 1.57.0
- release 2 (by relup.sh)
kde4-kig.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/kde4-kig.spec b/kde4-kig.spec
index 013c5c3..c968f0a 100644
--- a/kde4-kig.spec
+++ b/kde4-kig.spec
@@ -5,7 +5,7 @@ Summary:K Desktop Environment - Interactive Geometry
Summary(pl.UTF-8): K Desktop Environment - Interaktywna geometria
Name: kde4-kig
Version: 4.14.3
-Release: 1
+Release: 2
License: GPL
Group: X11/Applications/Science
Source0:
http://download.kde.org/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kde4-kig.git/commitdiff/fb87aba20b04ef647419bf79d1b60c38335de4ce
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/mkvtoolnix] - BR s/rake/ruby-rake/
commit 22a61958e936d8b94108786fdcf2e809d3a4f7f6
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Thu Feb 19 08:13:11 2015 +0100
- BR s/rake/ruby-rake/
mkvtoolnix.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/mkvtoolnix.spec b/mkvtoolnix.spec
index d14b9d1..01f3870 100644
--- a/mkvtoolnix.spec
+++ b/mkvtoolnix.spec
@@ -35,7 +35,7 @@ BuildRequires:pcre-cxx-devel
BuildRequires: pkgconfig
BuildRequires: qt5-build = 4.3.3-3
%endif
-BuildRequires: rake
+BuildRequires: ruby-rake
BuildRequires: ruby-modules
%{?with_wx:BuildRequires: wxGTK2-unicode-devel = 2.6.0}
BuildRequires: zlib-devel
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mkvtoolnix.git/commitdiff/22a61958e936d8b94108786fdcf2e809d3a4f7f6
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/kernel] - fix for adjtimex failed for set_frequency... error
commit 483f80a312eef19f5ee2f3eb435151a545c8b7ee
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Thu Feb 19 20:31:50 2015 +0100
- fix for adjtimex failed for set_frequency... error
kernel-small_fixes.patch | 68
1 file changed, 68 insertions(+)
---
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index d4b6034..9e8d667 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -26,3 +26,71 @@
exit
fi
done
+From 29183a70b0b828500816bd794b3fe192fce89f73 Mon Sep 17 00:00:00 2001
+From: John Stultz john.stu...@linaro.org
+Date: Mon, 9 Feb 2015 23:30:36 -0800
+Subject: ntp: Fixup adjtimex freq validation on 32-bit systems
+
+Additional validation of adjtimex freq values to avoid
+potential multiplication overflows were added in commit
+5e5aeb4367b (time: adjtimex: Validate the ADJ_FREQUENCY values)
+
+Unfortunately the patch used LONG_MAX/MIN instead of
+LLONG_MAX/MIN, which was fine on 64-bit systems, but being
+much smaller on 32-bit systems caused false positives
+resulting in most direct frequency adjustments to fail w/
+EINVAL.
+
+ntpd only does direct frequency adjustments at startup, so
+the issue was not as easily observed there, but other time
+sync applications like ptpd and chrony were more effected by
+the bug.
+
+See bugs:
+
+ https://bugzilla.kernel.org/show_bug.cgi?id=92481
+ https://bugzilla.redhat.com/show_bug.cgi?id=1188074
+
+This patch changes the checks to use LLONG_MAX for
+clarity, and additionally the checks are disabled
+on 32-bit systems since LLONG_MAX/PPM_SCALE is always
+larger then the 32-bit long freq value, so multiplication
+overflows aren't possible there.
+
+Reported-by: Josh Boyer jwbo...@fedoraproject.org
+Reported-by: George Joseph george.jos...@fairview5.com
+Tested-by: George Joseph george.jos...@fairview5.com
+Signed-off-by: John Stultz john.stu...@linaro.org
+Signed-off-by: Peter Zijlstra (Intel) pet...@infradead.org
+Cc: sta...@vger.kernel.org # v3.19+
+Cc: Linus Torvalds torva...@linux-foundation.org
+Cc: Sasha Levin sasha.le...@oracle.com
+Link:
http://lkml.kernel.org/r/1423553436-29747-1-git-send-email-john.stu...@linaro.org
+[ Prettified the changelog and the comments a bit. ]
+Signed-off-by: Ingo Molnar mi...@kernel.org
+
+diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
+index 4b585e0..0f60b08 100644
+--- a/kernel/time/ntp.c
b/kernel/time/ntp.c
+@@ -633,10 +633,14 @@ int ntp_validate_timex(struct timex *txc)
+ if ((txc-modes ADJ_SETOFFSET) (!capable(CAP_SYS_TIME)))
+ return -EPERM;
+
+- if (txc-modes ADJ_FREQUENCY) {
+- if (LONG_MIN / PPM_SCALE txc-freq)
++ /*
++ * Check for potential multiplication overflows that can
++ * only happen on 64-bit systems:
++ */
++ if ((txc-modes ADJ_FREQUENCY) (BITS_PER_LONG == 64)) {
++ if (LLONG_MIN / PPM_SCALE txc-freq)
+ return -EINVAL;
+- if (LONG_MAX / PPM_SCALE txc-freq)
++ if (LLONG_MAX / PPM_SCALE txc-freq)
+ return -EINVAL;
+ }
+
+--
+cgit v0.10.2
+
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/483f80a312eef19f5ee2f3eb435151a545c8b7ee
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/pingus] - remove bad jpeg file - rebuild with boost 1.57.0 - rel 11
commit 790a27cf4ef7001cbe6638d4f838e5104e0e2c51
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Thu Feb 19 20:42:38 2015 +0100
- remove bad jpeg file
- rebuild with boost 1.57.0
- rel 11
pingus.spec | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/pingus.spec b/pingus.spec
index fb903e1..fca23a7 100644
--- a/pingus.spec
+++ b/pingus.spec
@@ -7,7 +7,7 @@ Summary(pl.UTF-8): Gra typu lemmingi z pingwinami w roli
głównej
Summary(pt_BR.UTF-8): Um clone de lemmings com pingüins
Name: pingus
Version: 0.7.6
-Release: 10
+Release: 11
License: GPL v3+
Group: X11/Applications/Games
Source0: http://pingus.googlecode.com/files/%{name}-%{version}.tar.bz2
@@ -63,6 +63,9 @@ install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
installbuild/%{name} $RPM_BUILD_ROOT%{_bindir}
cp -r data $RPM_BUILD_ROOT%{_datadir}/%{name}
+# bad jpeg kills file(1)
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/data/images/textures/easter_sky.jpg
+
%clean
rm -rf $RPM_BUILD_ROOT
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pingus.git/commitdiff/790a27cf4ef7001cbe6638d4f838e5104e0e2c51
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/file] - fix use count (30) exceeded error on some jpg files - rel 2
commit a46ba80672bcda58898da438a0d04371aeb7926f
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Thu Feb 19 21:10:06 2015 +0100
- fix use count (30) exceeded error on some jpg files
- rel 2
file.spec| 4 +++-
name-use-count.patch | 11 +++
2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/file.spec b/file.spec
index 6be44b0..0900c54 100644
--- a/file.spec
+++ b/file.spec
@@ -30,7 +30,7 @@ Summary(zh_CN.UTF-8): 判定文件类型的工具。
Summary(zh_TW.UTF-8): 用於決定檔案類型的一個工具程式。
Name: file
Version: 5.22
-Release: 1
+Release: 2
License: distributable
Group: Applications/File
Source0: ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
@@ -44,6 +44,7 @@ Patch0: %{name}-selinux.patch
Patch1:searchpath.patch
Patch2:automake.patch
Patch3:%{name}-perl.patch
+Patch4:name-use-count.patch
URL: http://www.darwinsys.com/file/
BuildRequires: autoconf = 2.50
BuildRequires: automake
@@ -270,6 +271,7 @@ Wiązania Pythona 3 do biblioteki libmagic.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%if %{cc_version} 3.4
%{__sed} -i -e 's,-Wextra,,' configure.ac
diff --git a/name-use-count.patch b/name-use-count.patch
new file mode 100644
index 000..e5d2aa7
--- /dev/null
+++ b/name-use-count.patch
@@ -0,0 +1,11 @@
+--- file-5.22/src/file.h~ 2015-01-01 18:07:34.0 +0100
file-5.22/src/file.h 2015-02-19 20:58:10.783901201 +0100
+@@ -412,7 +412,7 @@
+ uint16_t elf_phnum_max;
+ uint16_t elf_notes_max;
+ #define FILE_INDIR_MAX 15
+-#define FILE_NAME_MAX 30
++#define FILE_NAME_MAX 256
+ #define FILE_ELF_SHNUM_MAX 32768
+ #define FILE_ELF_PHNUM_MAX 128
+ #define FILE_ELF_NOTES_MAX 256
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/file.git/commitdiff/a46ba80672bcda58898da438a0d04371aeb7926f
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: kernel: linux-3.10.tar.xz patch-3.10.69.xz reiser4-for-3.10.patch.gz
Request by: baggins Files fetched: 1 ALREADY GOT: http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.10.tar.xz 4f25cd5bec5f8d5a7d935b3f2ccb8481 linux-3.10.tar.xz STORED: http://www.kernel.org/pub/linux/kernel/v3.x/patch-3.10.69.xz b2a3192b134be87f485df81e1e6a5035 patch-3.10.69.xz Size: 1035936 bytes ALREADY GOT: http://downloads.sourceforge.net/reiser4/reiser4-for-linux-3.x/reiser4-for-3.10.patch.gz 5af1bdc286a88ef79268337c7ff17508 reiser4-for-3.10.patch.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
DISTFILES: kernel: linux-3.18.tar.xz patch-3.18.7.xz uksm-0.1.2.3-for-v3.18.patch
Request by: baggins Files fetched: 1 ALREADY GOT: http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.tar.xz 9e854df51ca3fef8bfe566dbd7b89241 linux-3.18.tar.xz ALREADY GOT: http://www.kernel.org/pub/linux/kernel/v3.x/patch-3.18.7.xz 9db3178b87ddf7c05e6191bf57645610 patch-3.18.7.xz STORED: http://kerneldedup.org/download/uksm/0.1.2.3/uksm-0.1.2.3-for-v3.18.patch b6a2b2aae9c2844d0c74690632d7019e uksm-0.1.2.3-for-v3.18.patch Size: 176801 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/kernel/LINUX_3_10] - 3.10.69 - added fix for adjtimex failed for set_frequency... error
commit 5005eb474909532ced60bfa0ec594436fa6a9d27
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Thu Feb 19 20:29:48 2015 +0100
- 3.10.69
- added fix for adjtimex failed for set_frequency... error
kernel-small_fixes.patch | 68
kernel.spec | 4 +--
2 files changed, 70 insertions(+), 2 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 701e86b..fc102b3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -71,7 +71,7 @@
%definerel 1
%definebasever 3.10
-%definepostver .68
+%definepostver .69
%defineversuffix -%{basever}
@@ -116,7 +116,7 @@ Source0:
http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
# Source0-md5: 4f25cd5bec5f8d5a7d935b3f2ccb8481
%if %{postver} != .0
Patch0:
http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5: dfa635d7e8975f4c765d5fba7d1fad0d
+# Patch0-md5: b2a3192b134be87f485df81e1e6a5035
%endif
Source1: kernel.sysconfig
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 5c0de9d..4c8ae25 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -112,3 +112,71 @@ index 4e565c8..732648b 100644
spin_lock_init(group-fanotify_data.access_lock);
--
cgit v0.10.1
+From 29183a70b0b828500816bd794b3fe192fce89f73 Mon Sep 17 00:00:00 2001
+From: John Stultz john.stu...@linaro.org
+Date: Mon, 9 Feb 2015 23:30:36 -0800
+Subject: ntp: Fixup adjtimex freq validation on 32-bit systems
+
+Additional validation of adjtimex freq values to avoid
+potential multiplication overflows were added in commit
+5e5aeb4367b (time: adjtimex: Validate the ADJ_FREQUENCY values)
+
+Unfortunately the patch used LONG_MAX/MIN instead of
+LLONG_MAX/MIN, which was fine on 64-bit systems, but being
+much smaller on 32-bit systems caused false positives
+resulting in most direct frequency adjustments to fail w/
+EINVAL.
+
+ntpd only does direct frequency adjustments at startup, so
+the issue was not as easily observed there, but other time
+sync applications like ptpd and chrony were more effected by
+the bug.
+
+See bugs:
+
+ https://bugzilla.kernel.org/show_bug.cgi?id=92481
+ https://bugzilla.redhat.com/show_bug.cgi?id=1188074
+
+This patch changes the checks to use LLONG_MAX for
+clarity, and additionally the checks are disabled
+on 32-bit systems since LLONG_MAX/PPM_SCALE is always
+larger then the 32-bit long freq value, so multiplication
+overflows aren't possible there.
+
+Reported-by: Josh Boyer jwbo...@fedoraproject.org
+Reported-by: George Joseph george.jos...@fairview5.com
+Tested-by: George Joseph george.jos...@fairview5.com
+Signed-off-by: John Stultz john.stu...@linaro.org
+Signed-off-by: Peter Zijlstra (Intel) pet...@infradead.org
+Cc: sta...@vger.kernel.org # v3.19+
+Cc: Linus Torvalds torva...@linux-foundation.org
+Cc: Sasha Levin sasha.le...@oracle.com
+Link:
http://lkml.kernel.org/r/1423553436-29747-1-git-send-email-john.stu...@linaro.org
+[ Prettified the changelog and the comments a bit. ]
+Signed-off-by: Ingo Molnar mi...@kernel.org
+
+diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
+index 4b585e0..0f60b08 100644
+--- a/kernel/time/ntp.c
b/kernel/time/ntp.c
+@@ -633,10 +633,14 @@ int ntp_validate_timex(struct timex *txc)
+ if ((txc-modes ADJ_SETOFFSET) (!capable(CAP_SYS_TIME)))
+ return -EPERM;
+
+- if (txc-modes ADJ_FREQUENCY) {
+- if (LONG_MIN / PPM_SCALE txc-freq)
++ /*
++ * Check for potential multiplication overflows that can
++ * only happen on 64-bit systems:
++ */
++ if ((txc-modes ADJ_FREQUENCY) (BITS_PER_LONG == 64)) {
++ if (LLONG_MIN / PPM_SCALE txc-freq)
+ return -EINVAL;
+- if (LONG_MAX / PPM_SCALE txc-freq)
++ if (LLONG_MAX / PPM_SCALE txc-freq)
+ return -EINVAL;
+ }
+
+--
+cgit v0.10.2
+
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/5005eb474909532ced60bfa0ec594436fa6a9d27
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/rstudio] - fix moc parsing with boost 1.57.0 - rel 2
commit ff706f6c77b62b78fb94c5a04a5668f824aace00
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Thu Feb 19 22:01:46 2015 +0100
- fix moc parsing with boost 1.57.0
- rel 2
boost-moc.patch | 24
rstudio.spec| 5 -
2 files changed, 28 insertions(+), 1 deletion(-)
---
diff --git a/rstudio.spec b/rstudio.spec
index 17db0fa..ba2124c 100644
--- a/rstudio.spec
+++ b/rstudio.spec
@@ -2,7 +2,7 @@ Summary:IDE for R
Summary(pl.UTF-8): IDE dla R
Name: rstudio
Version: 0.99.39
-Release: 1
+Release: 2
License: AGPLv3
Group: Applications
Source0:
https://github.com/rstudio/rstudio/archive/v%{version}.tar.gz?/%{name}-%{version}.tar.gz
@@ -27,6 +27,7 @@ Source9:
rmarkdown_0.3.12_8a78f712202263200f2110ec8aa24a55c2726e37.tar.xz
# Source9-md5: 358f9f4bf2f35dd58d4771f6b24d252e
Source10: shinyapps_0.3.61_d3ab9e1cdd02f0067d69fe6fc816a61c8a5f2218.tar.xz
# Source10-md5:3f5ce12f86b00a2e77067d7769fffe08
+Patch0:boost-moc.patch
URL: http://rstudio.org/
BuildRequires: QtWebKit-devel
BuildRequires: QtXmlPatterns-devel
@@ -89,6 +90,8 @@ mkdir -p dependencies/common/libclang/3.5/linux/x86_64
ln -s %{_libdir}/libclang.so
dependencies/common/libclang/3.5/linux/x86_64/libclang.so
%endif
+%patch0 -p1
+
%build
install -d build
cd build
diff --git a/boost-moc.patch b/boost-moc.patch
new file mode 100644
index 000..68321b6
--- /dev/null
+++ b/boost-moc.patch
@@ -0,0 +1,24 @@
+--- rstudio-0.99.39/src/cpp/core/include/core/FilePath.hpp~2015-02-19
21:35:05.0 +0100
rstudio-0.99.39/src/cpp/core/include/core/FilePath.hpp 2015-02-19
21:35:13.360551778 +0100
+@@ -23,7 +23,9 @@
+ #include boost/scoped_ptr.hpp
+ #include boost/function.hpp
+
++#ifndef Q_MOC_RUN
+ #include boost/utility.hpp
++#endif
+
+ #include core/Error.hpp
+ #include core/Log.hpp
+--- rstudio-0.99.39/src/cpp/desktop/DesktopSessionLauncher.hpp~
2015-02-19 21:37:22.0 +0100
rstudio-0.99.39/src/cpp/desktop/DesktopSessionLauncher.hpp 2015-02-19
21:46:51.487213390 +0100
+@@ -18,7 +18,9 @@
+
+ #include string
+
++#ifndef Q_MOC_RUN
+ #include boost/utility.hpp
++#endif
+
+ #include core/Error.hpp
+ #include core/FilePath.hpp
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rstudio.git/commitdiff/ff706f6c77b62b78fb94c5a04a5668f824aace00
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/qbittorrent] - fix moc problems on boost 1.57.0 - rel 2
commit a64a35a546b112cdbc30aa5d67cc7e1302adb2d8
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Thu Feb 19 22:30:35 2015 +0100
- fix moc problems on boost 1.57.0
- rel 2
boost-moc.patch | 87
qbittorrent.spec | 4 ++-
2 files changed, 90 insertions(+), 1 deletion(-)
---
diff --git a/qbittorrent.spec b/qbittorrent.spec
index 4e89e18..8d04190 100644
--- a/qbittorrent.spec
+++ b/qbittorrent.spec
@@ -8,13 +8,14 @@ Summary(hu.UTF-8):qbittorrent - Qt4-alapú torrent kliens
Summary(pl.UTF-8): qbittorrent - graficzny klient torrenta oparty na Qt4
Name: qbittorrent
Version: 3.1.11
-Release: 1
+Release: 2
License: GPL v2+
Group: X11/Applications
Source0:
http://downloads.sourceforge.net/qbittorrent/%{name}-%{version}.tar.gz
# Source0-md5: fcdcb9c0d42d040ead66d1a9cf33cd28
Patch0:lang-hu-2.3.0.patch
Patch1:cxx.patch
+Patch2:boost-moc.patch
URL: http://qbittorrent.sourceforge.net/
BuildRequires: GeoIP-devel
BuildRequires: QtCore-devel = %{qtver}
@@ -52,6 +53,7 @@ qTorrent - graficzny klient torrenta oparty na Qt4.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%if %{with qsa}
%{__rm} -r src/qtsingleapp
diff --git a/boost-moc.patch b/boost-moc.patch
new file mode 100644
index 000..88d0ec4
--- /dev/null
+++ b/boost-moc.patch
@@ -0,0 +1,87 @@
+--- qbittorrent-3.1.11/src/qtlibtorrent/qbtsession.h.orig 2015-02-19
22:16:34.767200481 +0100
qbittorrent-3.1.11/src/qtlibtorrent/qbtsession.h 2015-02-19
22:12:45.290535475 +0100
+@@ -43,9 +43,11 @@
+ #include QTimer
+ #include QNetworkCookie
+
++#ifndef Q_MOC_RUN
+ #include libtorrent/version.hpp
+ #include libtorrent/session.hpp
+ #include libtorrent/ip_filter.hpp
++#endif
+
+ #include qtracker.h
+ #include qtorrenthandle.h
+--- qbittorrent-3.1.11/src/qtlibtorrent/filterparserthread.h~ 2014-10-22
21:45:31.0 +0200
qbittorrent-3.1.11/src/qtlibtorrent/filterparserthread.h 2015-02-19
22:18:32.677199626 +0100
+@@ -37,8 +37,10 @@
+ #include QStringList
+ #include QHostAddress
+
++#ifndef Q_MOC_RUN
+ #include libtorrent/session.hpp
+ #include libtorrent/ip_filter.hpp
++#endif
+
+ using namespace std;
+
+--- qbittorrent-3.1.11/src/preferences/options_imp.cpp~2014-10-22
21:45:31.0 +0200
qbittorrent-3.1.11/src/preferences/options_imp.cpp 2015-02-19
22:19:55.923865690 +0100
+@@ -38,7 +38,9 @@
+ #include QTranslator
+ #include QDesktopServices
+
++#ifndef Q_MOC_RUN
+ #include libtorrent/version.hpp
++#endif
+
+ #include options_imp.h
+ #include preferences.h
+--- qbittorrent-3.1.11/src/preferences/options_imp.h~ 2014-10-22
21:45:31.0 +0200
qbittorrent-3.1.11/src/preferences/options_imp.h 2015-02-19
22:20:37.453865390 +0100
+@@ -32,7 +32,9 @@
+ #define OPTIONS_IMP_H
+
+ #include ui_options.h
++#ifndef Q_MOC_RUN
+ #include libtorrent/ip_filter.hpp
++#endif
+
+ // actions on double-click on torrents
+ enum DoubleClickAction {TOGGLE_PAUSE, OPEN_DEST, NO_ACTION};
+--- qbittorrent-3.1.11/src/properties/peeraddition.h~ 2014-10-22
21:45:31.0 +0200
qbittorrent-3.1.11/src/properties/peeraddition.h 2015-02-19
22:22:30.387197906 +0100
+@@ -36,7 +36,9 @@
+ #include QMessageBox
+ #include QHostAddress
+ #include ui_peer.h
++#ifndef Q_MOC_RUN
+ #include libtorrent/session.hpp
++#endif
+
+ #include boost/version.hpp
+ #if BOOST_VERSION 103500
+--- qbittorrent-3.1.11/src/geoip/geoipmanager.h~ 2014-10-22
21:45:31.0 +0200
qbittorrent-3.1.11/src/geoip/geoipmanager.h2015-02-19
22:24:06.623863876 +0100
+@@ -31,7 +31,9 @@
+ #ifndef GEOIPMANAGER_H
+ #define GEOIPMANAGER_H
+
++#ifndef Q_MOC_RUN
+ #include libtorrent/session.hpp
++#endif
+ #include QString
+ #include QIcon
+
+--- qbittorrent-3.1.11/src/trackerlogin.h~ 2014-10-22 21:45:31.0
+0200
qbittorrent-3.1.11/src/trackerlogin.h 2015-02-19 22:25:55.037196425
+0100
+@@ -33,7 +33,9 @@
+
+ #include QDialog
+ #include QMessageBox
++#ifndef Q_MOC_RUN
+ #include libtorrent/session.hpp
++#endif
+ #include ui_login.h
+ #include qtorrenthandle.h
+
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qbittorrent.git/commitdiff/a64a35a546b112cdbc30aa5d67cc7e1302adb2d8
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/vcmi] - release 2 (by relup.sh)
commit 6ee62a06658e904793aad1a0526c2060d81e3513
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Mon Feb 16 23:30:00 2015 +0100
- release 2 (by relup.sh)
vcmi.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/vcmi.spec b/vcmi.spec
index 3c48fe9..1b939fd 100644
--- a/vcmi.spec
+++ b/vcmi.spec
@@ -1,7 +1,7 @@
Summary: Heroes 3: WoG recreated
Name: vcmi
Version: 0.97
-Release: 1
+Release: 2
License: GPL v2+
Group: X11/Applications/Games
Source0: https://github.com/vcmi/vcmi/archive/%{version}.tar.gz
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vcmi.git/commitdiff/6ee62a06658e904793aad1a0526c2060d81e3513
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xsd] - rebuild with boost 1.57.0 - release 11 (by relup.sh)
commit e5f57df81e1ab685478f55f7a5906e02ececff45 Author: Jan Rękorajski bagg...@pld-linux.org Date: Tue Feb 17 07:55:53 2015 +0100 - rebuild with boost 1.57.0 - release 11 (by relup.sh) xsd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/xsd.spec b/xsd.spec index 18fdbfe..10e9771 100644 --- a/xsd.spec +++ b/xsd.spec @@ -2,7 +2,7 @@ Summary:W3C XML schema to C++ data binding compiler Summary(pl.UTF-8): Kompilator schematów W3C XML do wiązań danych C++ Name: xsd Version: 3.3.0 -Release: 10 +Release: 11 Group: Development/Tools # Exceptions permit otherwise GPLv2 incompatible combination with ASL-licensed Xerces License: GPL v2 with FLOSS exceptions gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xsd.git/commitdiff/e5f57df81e1ab685478f55f7a5906e02ececff45 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/wesnoth] - rebuild with boost 1.57.0 - release 10 (by relup.sh)
commit 15d0fbc80068f46bea9d5e6c151a7bcb4d1ceb8a Author: Jan Rękorajski bagg...@pld-linux.org Date: Tue Feb 17 07:55:43 2015 +0100 - rebuild with boost 1.57.0 - release 10 (by relup.sh) wesnoth.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/wesnoth.spec b/wesnoth.spec index 985062f..e112c27 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -11,7 +11,7 @@ Summary(hu.UTF-8):Fantasy környezetben játszódó stratégiai játék Summary(pl.UTF-8): Strategiczna gra z motywem fantasy Name: wesnoth Version: 1.10.4 -Release: 9 +Release: 10 Epoch: 1 License: GPL v2+ Group: X11/Applications/Games/Strategy gitweb: http://git.pld-linux.org/gitweb.cgi/packages/wesnoth.git/commitdiff/15d0fbc80068f46bea9d5e6c151a7bcb4d1ceb8a ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/vigra] - rebuild with boost 1.57.0 - release 6 (by relup.sh)
commit 0c8260c3bb9babf98dba21cc76d8dc0919acb7cc Author: Jan Rękorajski bagg...@pld-linux.org Date: Tue Feb 17 07:55:33 2015 +0100 - rebuild with boost 1.57.0 - release 6 (by relup.sh) vigra.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/vigra.spec b/vigra.spec index d2ec54a..cf4bf84 100644 --- a/vigra.spec +++ b/vigra.spec @@ -3,7 +3,7 @@ Summary:Generic Programming for Computer Vision Summary(pl.UTF-8): Ogólne programowanie obrazu komputerowego Name: vigra Version: 1.10.0 -Release: 5 +Release: 6 License: MIT Group: Libraries #Source0Download: http://ukoethe.github.io/vigra/#download gitweb: http://git.pld-linux.org/gitweb.cgi/packages/vigra.git/commitdiff/0c8260c3bb9babf98dba21cc76d8dc0919acb7cc ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/hwsd] - rebuild with boost 1.57.0 - release 2 (by relup.sh)
commit 75c7011e695afb0b2b5308854e725b79773f90cd
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Wed Feb 18 17:16:02 2015 +0100
- rebuild with boost 1.57.0
- release 2 (by relup.sh)
hwsd.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/hwsd.spec b/hwsd.spec
index 09bf38b..e5f7cd5 100644
--- a/hwsd.spec
+++ b/hwsd.spec
@@ -6,7 +6,7 @@ Summary:Local and remote ZeroConf service discovery for
hardware resources
Summary(pl.UTF-8): Lokalne i zdalne wykrywanie usług ZeroConf dla zasobów
sprzętowych
Name: hwsd
Version: 1.1.1
-Release: 1
+Release: 2
License: LGPL v2.1 (library), GPL v3+ (applications)
Group: Libraries
Source0:
https://github.com/Eyescale/hwsd/archive/%{version}/%{name}-%{version}.tar.gz
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hwsd.git/commitdiff/75c7011e695afb0b2b5308854e725b79773f90cd
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/OpenImageIO] - fix more warnings as errors
commit c3e5ad9758408e8fdbb032f2dff8a370f8c6ae4f
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Wed Feb 18 17:17:05 2015 +0100
- fix more warnings as errors
OpenImageIO-werror.patch | 14 ++
1 file changed, 14 insertions(+)
---
diff --git a/OpenImageIO-werror.patch b/OpenImageIO-werror.patch
index 6888edf..97f8045 100644
--- a/OpenImageIO-werror.patch
+++ b/OpenImageIO-werror.patch
@@ -9,3 +9,17 @@
case dpx::kUndefined:
tmpstr = Undefined;
break;
+--- OpenImageIO-oiio-bcdad81/src/libOpenImageIO/imagebufalgo.cpp~
2013-11-01 18:03:46.0 +0100
OpenImageIO-oiio-bcdad81/src/libOpenImageIO/imagebufalgo.cpp
2015-02-18 17:15:01.274966027 +0100
+@@ -1063,9 +1063,9 @@
+ if (error)
+ continue; // ignore errors
+ // now, draw to our target surface
+-for (int j = 0; j slot-bitmap.rows; ++j) {
++for (unsigned int j = 0; j slot-bitmap.rows; ++j) {
+ int ry = y + j - slot-bitmap_top;
+-for (int i = 0; i slot-bitmap.width; ++i) {
++for (unsigned int i = 0; i slot-bitmap.width; ++i) {
+ int rx = x + i + slot-bitmap_left;
+ float b = slot-bitmap.buffer[slot-bitmap.pitch*j+i] /
255.0f;
+ R.getpixel (rx, ry, pixelcolor);
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/OpenImageIO.git/commitdiff/c3e5ad9758408e8fdbb032f2dff8a370f8c6ae4f
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/OpenImageIO] - rebuild with boost 1.57.0 - release 14 (by relup.sh)
commit a90cbb93977b8536eb164d39c5cc7d72145d4d51
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Wed Feb 18 17:17:40 2015 +0100
- rebuild with boost 1.57.0
- release 14 (by relup.sh)
OpenImageIO.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 443e752..3449a81 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -17,7 +17,7 @@ Summary: Library for reading and writing images
Summary(pl.UTF-8): Biblioteka do odczytu i zapisu obrazów
Name: OpenImageIO
Version: 1.2.3
-Release: 13
+Release: 14
License: BSD
Group: Libraries
Source0:
https://github.com/OpenImageIO/oiio/tarball/Release-%{version}/%{name}-%{version}.tar.gz
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/OpenImageIO.git/commitdiff/a90cbb93977b8536eb164d39c5cc7d72145d4d51
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/Collage] - rebuild with boost 1.57.0 - release 2 (by relup.sh)
commit d500a81bcba60f0907e71226ba555432fce313af
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Wed Feb 18 17:16:32 2015 +0100
- rebuild with boost 1.57.0
- release 2 (by relup.sh)
Collage.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/Collage.spec b/Collage.spec
index d3b9a82..63e9cf8 100644
--- a/Collage.spec
+++ b/Collage.spec
@@ -6,7 +6,7 @@ Summary:Cross-platform C++ network library
Summary(pl.UTF-8): Wieloplatformowa biblioteka sieciowa dla C++
Name: Collage
Version: 1.1.2
-Release: 1
+Release: 2
License: LGPL v2.1
Group: Libraries
Source0:
https://github.com/Eyescale/Collage/archive/%{version}/%{name}-%{version}.tar.gz
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/Collage.git/commitdiff/d500a81bcba60f0907e71226ba555432fce313af
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/gnuradio] - updated PyQt4 deps
commit 8d8f9a0426458f7318b335ce3553710462be238b Author: Jan Rękorajski bagg...@pld-linux.org Date: Tue Feb 17 23:05:18 2015 +0100 - updated PyQt4 deps gnuradio.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/gnuradio.spec b/gnuradio.spec index 00b1e77..e5736d2 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -47,7 +47,7 @@ BuildRequires:orc-devel = 0.4.11 BuildRequires: portaudio-devel = 19 # R/S instead? BuildRequires: python-PyOpenGL -BuildRequires: python-PyQt4-devel = 4.4 +BuildRequires: sip-PyQt4 = 4.4 # R/S instead? BuildRequires: python-PyQwt-devel = 5.2 BuildRequires: python-cheetah = 2.0.0 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/gnuradio.git/commitdiff/8d8f9a0426458f7318b335ce3553710462be238b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/Lunchbox] - fix building with boost 1.57.0 - disable broken hooks in cmakefiles - rel 2
commit c428797bd8882d3afed8f4a4df2869a041e7b74f
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Wed Feb 18 17:10:36 2015 +0100
- fix building with boost 1.57.0
- disable broken hooks in cmakefiles
- rel 2
Lunchbox.spec | 7 ++-
boost-1.57.0.patch | 21 +
disable-broken-cmakefiles.patch | 34 ++
3 files changed, 61 insertions(+), 1 deletion(-)
---
diff --git a/Lunchbox.spec b/Lunchbox.spec
index 8a4f04e..0549434 100644
--- a/Lunchbox.spec
+++ b/Lunchbox.spec
@@ -8,13 +8,15 @@ Summary: Lunchbox - C++ library for multi-threading
programming
Summary(pl.UTF-8): Lunchbox - biblioteka C++ do programowania
wielowątkowego
Name: Lunchbox
Version: 1.10.0
-Release: 1
+Release: 2
License: LGPL v2.1
Group: Libraries
Source0:
https://github.com/Eyescale/Lunchbox/archive/%{version}/%{name}-%{version}.tar.gz
# Source0-md5: 3e01c3a2ddeeb7b3682e88092831d5a5
Source1:
https://github.com/Eyescale/CMake/archive/139ce7d/Eyescale-CMake-139ce7d.tar.gz
# Source1-md5: 4a6abcd9e0fc417528a8ca68a97e65eb
+Patch0:disable-broken-cmakefiles.patch
+Patch1:boost-1.57.0.patch
URL: http://pogl.wordpress.com/category/lunchbox/
BuildRequires: avahi-devel
BuildRequires: boost-devel = 1.41.0
@@ -79,6 +81,9 @@ Dokumentacja API biblioteki Lunchbox.
%{__mv} CMake-* CMake/common
%{__rm} .gitexternals
+%patch0 -p1
+%patch1 -p1
+
%build
install -d build
cd build
diff --git a/boost-1.57.0.patch b/boost-1.57.0.patch
new file mode 100644
index 000..538ae53
--- /dev/null
+++ b/boost-1.57.0.patch
@@ -0,0 +1,21 @@
+From a3b3b71f2d2fe7879fb9e444e70b2d74f0269fe1 Mon Sep 17 00:00:00 2001
+From: Stefan Eilemann stefan.eilem...@epfl.ch
+Date: Sat, 27 Dec 2014 14:44:16 +0100
+Subject: [PATCH] Compile fix for Boost 1.57
+
+---
+ lunchbox/any.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lunchbox/any.h b/lunchbox/any.h
+index 9f91e40..3618f3a 100644
+--- a/lunchbox/any.h
b/lunchbox/any.h
+@@ -38,6 +38,7 @@
+ #include boost/serialization/access.hpp
+ #include boost/serialization/assume_abstract.hpp
+ #include boost/serialization/base_object.hpp
++#include boost/serialization/type_info_implementation.hpp
+ #include boost/serialization/shared_ptr.hpp
+
+ // See boost/python/type_id.hpp
diff --git a/disable-broken-cmakefiles.patch b/disable-broken-cmakefiles.patch
new file mode 100644
index 000..21f322f
--- /dev/null
+++ b/disable-broken-cmakefiles.patch
@@ -0,0 +1,34 @@
+--- Lunchbox-1.10.0/CMake/common/TargetHooks.cmake.orig2014-10-02
12:07:38.0 +0200
Lunchbox-1.10.0/CMake/common/TargetHooks.cmake 2015-02-18
17:06:08.678295749 +0100
+@@ -4,9 +4,7 @@
+ # multiple subprojects are built in a single go, the properties are unique
per project
+
+ include(CMakeParseArguments)
+-include(clangcheckTargets)
+ include(CppcheckTargets)
+-include(CpplintTargets)
+
+ set(ALL_DEP_TARGETS )
+ set(ALL_LIB_TARGETS )
+@@ -19,10 +17,7 @@
+ set_property(GLOBAL PROPERTY ADD_EXE_MACRO_DEFINED 1)
+ macro(add_executable _target)
+ _add_executable(${_target} ${ARGN})
+-add_clangcheck(${_target})
+ add_cppcheck(${_target} POSSIBLE_ERROR FAIL_ON_WARNINGS
EXCLUDE_QT_MOC_FILES)
+-add_cpplint(${_target} CATEGORY_FILTER_OUT readability/streams
+- EXCLUDE_PATTERN .*moc_.*\\.cxx|Buildyard/Build)
+ set_property(GLOBAL APPEND PROPERTY ${PROJECT_NAME}_ALL_DEP_TARGETS
${_target})
+ endmacro()
+ endif()
+@@ -33,10 +28,7 @@
+ set_property(GLOBAL PROPERTY ADD_LIBRARY_MACRO_DEFINED 1)
+ macro(add_library _target)
+ _add_library(${_target} ${ARGN})
+-add_clangcheck(${_target})
+ add_cppcheck(${_target} POSSIBLE_ERROR FAIL_ON_WARNINGS
EXCLUDE_QT_MOC_FILES)
+-add_cpplint(${_target} CATEGORY_FILTER_OUT readability/streams
+- EXCLUDE_PATTERN .*moc_.*\\.cxx|Buildyard/Build)
+
+ # ignore IMPORTED add_library from finders (e.g. Qt)
+ cmake_parse_arguments(_arg IMPORTED ${ARGN})
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/Lunchbox.git/commitdiff/c428797bd8882d3afed8f4a4df2869a041e7b74f
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/gr-osmosdr] - rebuild with boost 1.57.0 - release 4 (by relup.sh)
commit a3fe4f391d9c6877bf4cfacb0ed89fbd8df84708 Author: Jan Rękorajski bagg...@pld-linux.org Date: Wed Feb 18 16:38:17 2015 +0100 - rebuild with boost 1.57.0 - release 4 (by relup.sh) gr-osmosdr.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/gr-osmosdr.spec b/gr-osmosdr.spec index 93cb488..b682dae 100644 --- a/gr-osmosdr.spec +++ b/gr-osmosdr.spec @@ -1,5 +1,5 @@ %define snap 20140111 -%definerel 3 +%definerel 4 Summary: Common software API for various radio hardware Name: gr-osmosdr Version: 0.1.1 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/gr-osmosdr.git/commitdiff/a3fe4f391d9c6877bf4cfacb0ed89fbd8df84708 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/gqrx] - rebuild with boost 1.57.0 - release 7 (by relup.sh)
commit 787f12f424bab49eb51fc63ac921636046aa99a8
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Wed Feb 18 16:45:42 2015 +0100
- rebuild with boost 1.57.0
- release 7 (by relup.sh)
gqrx.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/gqrx.spec b/gqrx.spec
index 4227086..3465691 100644
--- a/gqrx.spec
+++ b/gqrx.spec
@@ -4,7 +4,7 @@
Summary: Software defined radio receiver powered by GNU Radio and Qt
Name: gqrx
Version: 2.2.0
-Release: 6
+Release: 7
License: GPL v3+
Group: Applications/Engineering
Source0:
http://downloads.sourceforge.net/gqrx/%{name}-%{version}-src.tar.gz
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gqrx.git/commitdiff/787f12f424bab49eb51fc63ac921636046aa99a8
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ipset] - rel 2
commit 028c65cd970772939c3bc0cf06ad7d9d41f9b572 Author: Jan Rękorajski bagg...@pld-linux.org Date: Tue Jan 27 19:27:55 2015 +0100 - rel 2 ipset.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/ipset.spec b/ipset.spec index cbf8c3c..11053b6 100644 --- a/ipset.spec +++ b/ipset.spec @@ -22,7 +22,7 @@ exit 1 %define_enable_debug_packages 0 %endif -%definerel 1 +%definerel 2 %definepname ipset Summary: IP sets utility Summary(pl.UTF-8): Narzędzie do zarządzania zbiorami IP gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ipset.git/commitdiff/028c65cd970772939c3bc0cf06ad7d9d41f9b572 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/linux-fusion] - updated kernel modules build system
commit c90e5af280c7446ae4b49c914ddd4d6632c11604
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:33:57 2015 +0100
- updated kernel modules build system
linux-fusion.spec | 23 ---
1 file changed, 4 insertions(+), 19 deletions(-)
---
diff --git a/linux-fusion.spec b/linux-fusion.spec
index fbed2f7..ca944e4 100644
--- a/linux-fusion.spec
+++ b/linux-fusion.spec
@@ -13,26 +13,11 @@
exit 1
%endif
-%if %{_alt_kernel} != %{nil}
-%if 0%{?build_kernels:1}
-%{error:alt_kernel and build_kernels are mutually exclusive}
-exit 1
-%endif
-%undefine with_userspace
-%global_build_kernels %{alt_kernel}
-%else
-%global_build_kernels
%{?build_kernels:,%{?build_kernels}}
-%endif
-
%if %{without userspace}
# nothing to be placed to debuginfo package
%define_enable_debug_packages 0
%endif
-%definekbrs%(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo BuildRequires:kernel%%{_alt_kernel}-module-build =
3:2.6.20.2 ; done)
-%definekpkg%(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo %%kernel_pkg ; done)
-%definebkpkg %(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo %%build_kernel_pkg ; done)
-
%definerel 1
%definepname linux-fusion
Summary: Fusion and One Linux kernel modules
@@ -45,8 +30,8 @@ Group:Base/Kernel
Source0:
http://www.directfb.org/downloads/Core/linux-fusion/%{pname}-%{version}.tar.xz
# Source0-md5: 5799f52ec656cdd3da592c94a6262199
URL: http://www.directfb.org/
-%{?with_kernel:%{expand:%kbrs}}
-BuildRequires: rpmbuild(macros) = 1.678
+%{?with_kernel:%{expand:%buildrequires_kernel
kernel%%{_alt_kernel}-module-build = 3:2.6.20.2}}
+BuildRequires: rpmbuild(macros) = 1.701
BuildRequires: sed = 4.0
BuildRequires: tar = 1:1.22
BuildRequires: xz
@@ -154,7 +139,7 @@ Linux One to nowe API IPC wykorzystywane przez Comę.\
%install_kernel_modules -D installed -m one/linux-one -d misc\
%{nil}
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
%prep
%setup -q -n %{pname}-%{version}
@@ -168,7 +153,7 @@ ln -sf Makefile-2.6 linux/drivers/char/fusion/Makefile
ln -sf Makefile-2.6 one/Makefile
%build
-%{?with_kernel:%{expand:%bkpkg}}
+%{?with_kernel:%{expand:%build_kernel_packages}}
%install
rm -rf $RPM_BUILD_ROOT
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/linux-fusion.git/commitdiff/bddc560999d18a1038b78d9799a0fb1c0fd6377b
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/rtl8812au] - drop non-dist kernel support
commit e5fd085f58c58e5f0a21741d4dda11b3af4ed8a1
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:44:02 2015 +0100
- drop non-dist kernel support
rtl8812au.spec | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
---
diff --git a/rtl8812au.spec b/rtl8812au.spec
index 6594ccb..d247d81 100644
--- a/rtl8812au.spec
+++ b/rtl8812au.spec
@@ -1,5 +1,4 @@
# Conditional build:
-%bcond_without dist_kernel # allow non-distribution kernel
%bcond_withverbose # verbose build (V=1)
%if %{_alt_kernel} != %{nil}
@@ -42,7 +41,7 @@ Patch4: warnings.patch
Patch5:gcc-4.9.patch
Patch6:linux-3.18.patch
BuildRequires: rpmbuild(macros) = 1.678
-%{?with_dist_kernel:%{expand:%kbrs}}
+%{expand:%kbrs}
BuildRoot: %{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
%description
@@ -54,10 +53,8 @@ Summary: Driver for AC1200 (802.11ac) Wireless Dual-Band
USB Adapter\
Release: %{rel}@%{_kernel_ver_str}\
Group: Base/Kernel\
Requires(post,postun): /sbin/depmod\
-%if %{with dist_kernel}\
%requires_releq_kernel\
Requires(postun): %releq_kernel\
-%endif\
\
%description -n kernel%{_alt_kernel}-net-rtl8812au\
Driver for AC1200 (802.11ac) Wireless Dual-Band USB Adapter\
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rtl8812au.git/commitdiff/368320b44434167f92a735135c8fc21ff3eed5de
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/rtl8812au] - rel 6
commit 368320b44434167f92a735135c8fc21ff3eed5de Author: Jan Rękorajski bagg...@pld-linux.org Date: Tue Jan 27 19:45:09 2015 +0100 - rel 6 rtl8812au.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/rtl8812au.spec b/rtl8812au.spec index 8d0d7f8..d17aa44 100644 --- a/rtl8812au.spec +++ b/rtl8812au.spec @@ -4,7 +4,7 @@ # nothing to be placed to debuginfo package %define_enable_debug_packages 0 -%definerel 5 +%definerel 6 %definesnap20140901 %definepname rtl8812au Summary: Driver for AC1200 (802.11ac) Wireless Dual-Band USB Adapter gitweb: http://git.pld-linux.org/gitweb.cgi/packages/rtl8812au.git/commitdiff/368320b44434167f92a735135c8fc21ff3eed5de ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: rtl8812au: ERRORS:
Request by: baggins rtl8812au: undefined macro _alt_kernel 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/VirtualBox] - drop non-dist kernel support
commit 366f0df34911ca5d1011b8d56269ca86958f9499
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:51:05 2015 +0100
- drop non-dist kernel support
VirtualBox.spec | 13 +
1 file changed, 1 insertion(+), 12 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index c033791..74ddee5 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -13,7 +13,6 @@
# Conditional build:
%bcond_without doc # don't build the documentation
%bcond_without debuginfo # disable debuginfo creation (to save
space when compiling)
-%bcond_without dist_kernel # without distribution kernel
%bcond_without kernel # don't build kernel module
%bcond_without userspace # don't build userspace package
%bcond_withwebservice # webservice (SOAP) support
@@ -21,12 +20,6 @@
%bcond_without dkms# build dkms package
%bcond_without verbose
-%if %{without kernel}
-%undefine with_dist_kernel
-%else
-%define_duplicate_files_terminate_build0
-%endif
-
# The goal here is to have main, userspace, package built once with
# simple release number, and only rebuild kernel packages with kernel
# version as part of release number, without the need to bump release
@@ -172,7 +165,7 @@ BuildRequires: xerces-c-devel = 2.6.0
BuildRequires: yasm
BuildRequires: zlib-devel = 1.2.1
%endif
-%{?with_dist_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%kbrs}}
Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/groupdel
Requires(pre): /usr/bin/getgid
@@ -424,11 +417,9 @@ Requires(post,postun): /sbin/depmod\
Requires(post):systemd-units = 38\
Requires: dev = 2.9.0-7\
Requires: systemd-units = 38\
-%if %{with dist_kernel}\
%requires_releq_kernel\
Requires: %{releq_kernel -n drm}\
Requires(postun): %releq_kernel\
-%endif\
Provides: kernel(vboxguest) = %{version}-%{rel}\
Provides: kernel(vboxsf) = %{version}-%{rel}\
Provides: kernel(vboxvideo) = %{version}-%{rel}\
@@ -453,10 +444,8 @@ Group: Base/Kernel\
Requires(post,postun): /sbin/depmod\
Requires(post):systemd-units = 38\
Requires: dev = 2.9.0-7\
-%if %{with dist_kernel}\
%requires_releq_kernel\
Requires(postun): %releq_kernel\
-%endif\
Requires: systemd-units = 38\
Provides: kernel(vboxdrv) = %{version}-%{rel}\
Provides: kernel(vboxnetadp) = %{version}-%{rel}\
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/f29d6f098e50c6dc614ab84094cf74ed4cac87cc
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/VirtualBox] - updated kernel modules build system
commit a59a82ea4dffbc3d87cfcb67e98f95b2ac114490
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:52:21 2015 +0100
- updated kernel modules build system
VirtualBox.spec | 19 ---
1 file changed, 4 insertions(+), 15 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 74ddee5..ded718f 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -29,17 +29,6 @@
exit 1
%endif
-%if %{_alt_kernel} != %{nil}
-%if 0%{?build_kernels:1}
-%{error:alt_kernel and build_kernels are mutually exclusive}
-exit 1
-%endif
-%undefine with_userspace
-%global_build_kernels %{alt_kernel}
-%else
-%global_build_kernels
%{?build_kernels:,%{?build_kernels}}
-%endif
-
%if %{without userspace}
# nothing to be placed to debuginfo package
%undefine with_debuginfo
@@ -149,7 +138,7 @@ BuildRequires: python-devel
BuildRequires: python-modules
BuildRequires: qt4-build = 4.2.0
BuildRequires: qt4-linguist
-BuildRequires: rpmbuild(macros) = 1.678
+BuildRequires: rpmbuild(macros) = 1.701
BuildRequires: sed = 4.0
%if %{with doc}
BuildRequires: texlive-fonts-bitstream
@@ -165,7 +154,7 @@ BuildRequires: xerces-c-devel = 2.6.0
BuildRequires: yasm
BuildRequires: zlib-devel = 1.2.1
%endif
-%{?with_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%buildrequires_kernel
kernel%%{_alt_kernel}-module-build = 3:2.6.20.2}}
Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/groupdel
Requires(pre): /usr/bin/getgid
@@ -515,7 +504,7 @@ cd ../..\
%install_kernel_modules -D PLD-MODULE-BUILD/installed -m
PLD-MODULE-BUILD/GuestDrivers/vboxvideo/vboxvideo -d misc\
%{nil}
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
%prep
%setup -q -n %{pname}-%{version}
@@ -606,7 +595,7 @@ kmk %{?_smp_mflags}
%{__cc} %{rpmcflags} %{rpmldflags} -Wall -Werror
src/VBox/Additions/linux/sharedfolders/{mount.vboxsf.c,vbsfmount.c} -o
mount.vboxsf
%endif
-%{?with_kernel:%{expand:%bkpkg}}
+%{?with_kernel:%{expand:%build_kernel_packages}}
%install
rm -rf $RPM_BUILD_ROOT
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/f29d6f098e50c6dc614ab84094cf74ed4cac87cc
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/VirtualBox] - rel 2
commit f29d6f098e50c6dc614ab84094cf74ed4cac87cc
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:52:37 2015 +0100
- rel 2
VirtualBox.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index ded718f..01d75cc 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -43,7 +43,7 @@ exit 1
%definebkpkg %(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo %%build_kernel_pkg ; done)
%defineikpkg %(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo %%install_kernel_pkg ; done)
-%definerel 1
+%definerel 2
%definepname VirtualBox
Summary: VirtualBox - x86 hardware virtualizer
Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/f29d6f098e50c6dc614ab84094cf74ed4cac87cc
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/wl] - rel 4
commit 747711c2b9fe1437fd46f23a57fa0d0bdf8943f7
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:56:38 2015 +0100
- rel 4
wl.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/wl.spec b/wl.spec
index ab201b8..93b675d 100644
--- a/wl.spec
+++ b/wl.spec
@@ -6,7 +6,7 @@
# nothing to be placed to debuginfo package
%define_enable_debug_packages 0
-%definerel 3
+%definerel 4
%definepname wl
%definefile_ver%(echo %{version} | tr . _)
Summary: Broadcom 802.11 a/b/g/n hybrid Linux networking device driver
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wl.git/commitdiff/747711c2b9fe1437fd46f23a57fa0d0bdf8943f7
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/zfs] - updated kernel modules build system
commit 2d67b9de821995c174566fe0397501e23ca02d14
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 20:11:59 2015 +0100
- updated kernel modules build system
zfs.spec | 24 ++--
1 file changed, 6 insertions(+), 18 deletions(-)
---
diff --git a/zfs.spec b/zfs.spec
index a90980c..9f01db0 100644
--- a/zfs.spec
+++ b/zfs.spec
@@ -14,17 +14,6 @@
exit 1
%endif
-%if %{_alt_kernel} != %{nil}
-%if 0%{?build_kernels:1}
-%{error:alt_kernel and build_kernels are mutually exclusive}
-exit 1
-%endif
-%undefine with_userspace
-%global_build_kernels %{alt_kernel}
-%else
-%global_build_kernels
%{?build_kernels:,%{?build_kernels}}
-%endif
-
%if %{without userspace}
# nothing to be placed to debuginfo package
%define_enable_debug_packages 0
@@ -32,10 +21,6 @@ exit 1
%define_duplicate_files_terminate_build0
-%definekbrs%(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo BuildRequires:kernel%%{_alt_kernel}-module-build =
3:2.6.20.2,kernel%%{_alt_kernel}-spl-devel = 0.6.3 ; done)
-%definekpkg%(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo %%kernel_pkg ; done)
-%definebkpkg %(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo %%build_kernel_pkg ; done)
-
%definepname zfs
%definerel 4
Summary: Native Linux port of the ZFS filesystem
@@ -54,7 +39,10 @@ BuildRequires: autoconf = 2.50
BuildRequires: automake
BuildRequires: libtool
BuildRequires: rpmbuild(macros) = 1.701
-%{?with_kernel:%{expand:%kbrs}}
+%if %{with kernel}
+%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build =
3:2.6.20.2}
+%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-spl-devel = 0.6.3}
+%endif
%if %{with userspace}
BuildRequires: libblkid-devel
BuildRequires: libselinux-devel
@@ -219,7 +207,7 @@ p=`pwd`\
%{__make} install DESTDIR=$p/installed INSTALL_MOD_DIR=misc\
%{nil}
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
%prep
%setup -q -n %{pname}-%{version}
@@ -232,7 +220,7 @@ p=`pwd`\
%{__autoconf}
%{__autoheader}
%{__automake}
-%{?with_kernel:%{expand:%bkpkg}}
+%{?with_kernel:%{expand:%build_kernel_packages}}
%if %{with userspace}
%configure \
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/zfs.git/commitdiff/b6c66a4f17c3e8b6188d53ca175de43b103be4fd
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/zfs] - drop non-dist kernel support
commit 1b58aab16252422ec37fc3990de7dfcc08f9534b
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 20:10:13 2015 +0100
- drop non-dist kernel support
zfs.spec | 15 ++-
1 file changed, 2 insertions(+), 13 deletions(-)
---
diff --git a/zfs.spec b/zfs.spec
index 4e7eb38..a90980c 100644
--- a/zfs.spec
+++ b/zfs.spec
@@ -1,15 +1,10 @@
# TODO: PLDify init script
#
# Conditional build:
-%bcond_without dist_kernel # allow non-distribution kernel
%bcond_without kernel # don't build kernel modules
%bcond_without userspace # don't build userspace programs
%bcond_withverbose # verbose build (V=1)
#
-%if %{without kernel}
-%undefine with_dist_kernel
-%endif
-
# The goal here is to have main, userspace, package built once with
# simple release number, and only rebuild kernel packages with kernel
# version as part of release number, without the need to bump release
@@ -58,10 +53,8 @@ URL: http://zfsonlinux.org/
BuildRequires: autoconf = 2.50
BuildRequires: automake
BuildRequires: libtool
-%if %{with kernel}
-BuildRequires: rpmbuild(macros) = 1.379
-%{?with_dist_kernel:%{expand:%kbrs}}
-%endif
+BuildRequires: rpmbuild(macros) = 1.701
+%{?with_kernel:%{expand:%kbrs}}
%if %{with userspace}
BuildRequires: libblkid-devel
BuildRequires: libselinux-devel
@@ -163,10 +156,8 @@ Summary(pl.UTF-8): ZFS - moduły jądra Linuksa\
Release: %{rel}@%{_kernel_ver_str}\
Group: Base/Kernel\
Requires(post,postun): /sbin/depmod\
-%if %{with dist_kernel}\
%requires_releq_kernel\
Requires(postun): %releq_kernel\
-%endif\
\
%description -n kernel%{_alt_kernel}-zfs\
ZFS Linux kernel modules.\
@@ -179,10 +170,8 @@ Summary: ZFS Linux kernel headers\
Summary(pl.UTF-8): ZFS - pliki nagłówkowe jądra Linuksa\
Release: %{rel}@%{_kernel_ver_str}\
Group: Development/Building\
-%if %{with dist_kernel}\
Requires: kernel%{_alt_kernel}-headers\
Requires: kernel-zfs-common-devel\
-%endif\
\
%description -n kernel%{_alt_kernel}-zfs-devel\
ZFS Linux kernel headers configured for PLD kernel%{_alt_kernel},\
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/zfs.git/commitdiff/b6c66a4f17c3e8b6188d53ca175de43b103be4fd
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/zfs] - rel 5
commit b6c66a4f17c3e8b6188d53ca175de43b103be4fd
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 20:12:19 2015 +0100
- rel 5
zfs.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/zfs.spec b/zfs.spec
index 9f01db0..fe20cdf 100644
--- a/zfs.spec
+++ b/zfs.spec
@@ -22,7 +22,7 @@ exit 1
%define_duplicate_files_terminate_build0
%definepname zfs
-%definerel 4
+%definerel 5
Summary: Native Linux port of the ZFS filesystem
Summary(pl.UTF-8): Natywny linuksowy port systemu plików ZFS
Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/zfs.git/commitdiff/b6c66a4f17c3e8b6188d53ca175de43b103be4fd
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/linuxrdac] - updated kernel modules build system
commit 2866de7a641c3b6f25a20dc0aef155f698a7259a
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 20:21:45 2015 +0100
- updated kernel modules build system
linuxrdac.spec | 22 --
1 file changed, 4 insertions(+), 18 deletions(-)
---
diff --git a/linuxrdac.spec b/linuxrdac.spec
index 8bf9d30..4e850c7 100644
--- a/linuxrdac.spec
+++ b/linuxrdac.spec
@@ -2,23 +2,9 @@
# Conditional build:
%bcond_withverbose # verbose build (V=1)
-%if %{_alt_kernel} != %{nil}
-%if 0%{?build_kernels:1}
-%{error:alt_kernel and build_kernels are mutually exclusive}
-exit 1
-%endif
-%global_build_kernels %{alt_kernel}
-%else
-%global_build_kernels
%{?build_kernels:,%{?build_kernels}}
-%endif
-
# nothing to be placed to debuginfo package
%define_enable_debug_packages 0
-%definekbrs%(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo BuildRequires:kernel%%{_alt_kernel}-module-build =
3:2.6.20.2 ; done)
-%definekpkg%(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo %%kernel_pkg ; done)
-%definebkpkg %(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo %%build_kernel_pkg ; done)
-
%definerel 65
%definepname linuxrdac
Summary: RDAC Multi-Path Proxy Driver for Linux
@@ -33,8 +19,8 @@ Patch0: linuxrdac-linux-2.6.39.patch
Patch1:linuxrdac-linux-3.4.patch
Patch2:linuxrdac-linux-3.7.patch
#URL: -
-BuildRequires: rpmbuild(macros) = 1.678
-%{expand:%kbrs}
+BuildRequires: rpmbuild(macros) = 1.701
+%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build =
3:2.6.20.2}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -70,7 +56,7 @@ RDAC Multi-Path Proxy Driver for Linux.\
%install_kernel_modules -D installed -m mppVhba,mppUpper -d
kernel/drivers/scsi\
%{nil}
-%{expand:%kpkg}
+%{expand:%create_kernel_packages}
%prep
%setup -q -c
@@ -80,7 +66,7 @@ mv dkms_source_tree/* .
%patch2 -p1
%build
-%{expand:%bkpkg}
+%{expand:%build_kernel_packages}
%install
rm -rf $RPM_BUILD_ROOT
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/linuxrdac.git/commitdiff/bcde9f2d58994ec18822cc9486e85ff7fef32aab
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/dahdi-linux] - updated kernl modules build system
commit 453aa04e967758675671b8e93c4c92de48ee8ea8
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:16:57 2015 +0100
- updated kernl modules build system
dahdi-linux.spec | 21 +++--
1 file changed, 3 insertions(+), 18 deletions(-)
---
diff --git a/dahdi-linux.spec b/dahdi-linux.spec
index 0b3f534..d589480 100644
--- a/dahdi-linux.spec
+++ b/dahdi-linux.spec
@@ -30,26 +30,11 @@
exit 1
%endif
-%if %{_alt_kernel} != %{nil}
-%if 0%{?build_kernels:1}
-%{error:alt_kernel and build_kernels are mutually exclusive}
-exit 1
-%endif
-%undefine with_userspace
-%global_build_kernels %{alt_kernel}
-%else
-%global_build_kernels
%{?build_kernels:,%{?build_kernels}}
-%endif
-
%if %{without userspace}
# nothing to be placed to debuginfo package
%define_enable_debug_packages 0
%endif
-%definekbrs%(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo BuildRequires:kernel%%{_alt_kernel}-module-build =
3:2.6.20.2 ; done)
-%definekpkg%(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo %%kernel_pkg ; done)
-%definebkpkg %(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo %%build_kernel_pkg ; done)
-
%definerel 2
%definepname dahdi-linux
%defineFIRMWARE_URL
http://downloads.digium.com/pub/telephony/firmware/releases
@@ -75,7 +60,7 @@ Source7: %{FIRMWARE_URL}/dahdi-fw-hx8-2.06.tar.gz
Patch0:linux-3.18.patch
URL: http://www.asterisk.org/
BuildRequires: rpmbuild(macros) = 1.678
-%{?with_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%buildrequires_kernel
kernel%%{_alt_kernel}-module-build = 3:2.6.20.2}}
BuildRequires: perl-base
BuildRequires: rpmbuild(macros) = 1.379
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -169,7 +154,7 @@ cd ../..\
%endif\
%{nil}
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
%prep
%setup -q -n %{pname}-%{version}
@@ -190,7 +175,7 @@ chmod a+rx download-logger
%build
%{__make} include/dahdi/version.h
-%{?with_kernel:%{expand:%bkpkg}}
+%{?with_kernel:%{expand:%build_kernel_packages}}
%install
rm -rf $RPM_BUILD_ROOT
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dahdi-linux.git/commitdiff/fcd3b77f2ee888bc6838800f093860cd572f2a81
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/crash] - rel 2
commit 86befcd05c65b2f0f8e1d45a07988840f9ba7a69 Author: Jan Rękorajski bagg...@pld-linux.org Date: Tue Jan 27 19:17:58 2015 +0100 - rel 2 crash.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/crash.spec b/crash.spec index e4d164f..8e77bc2 100644 --- a/crash.spec +++ b/crash.spec @@ -20,7 +20,7 @@ exit 1 %define_enable_debug_packages 0 %endif -%definerel 1 +%definerel 2 %definepname crash Summary: Core Analysis Suite Summary(pl.UTF-8): Zestaw narzędzi do analizy zrzutów pamięci gitweb: http://git.pld-linux.org/gitweb.cgi/packages/crash.git/commitdiff/86befcd05c65b2f0f8e1d45a07988840f9ba7a69 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/kernel] - rel 2
commit 6b83e73a28aabbf61b1c525cbdfa54e62ddbc3d7 Author: Jan Rękorajski bagg...@pld-linux.org Date: Tue Jan 27 19:18:31 2015 +0100 - rel 2 kernel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/kernel.spec b/kernel.spec index a92eb38..6c68017 100644 --- a/kernel.spec +++ b/kernel.spec @@ -68,7 +68,7 @@ %definehave_pcmcia 0 %endif -%definerel 1 +%definerel 2 %definebasever 3.18 %definepostver .3 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/6b83e73a28aabbf61b1c525cbdfa54e62ddbc3d7 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/dahdi-linux] - updated macros BR - rel 3
commit fcd3b77f2ee888bc6838800f093860cd572f2a81
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:17:26 2015 +0100
- updated macros BR
- rel 3
dahdi-linux.spec | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/dahdi-linux.spec b/dahdi-linux.spec
index d589480..61ec4e6 100644
--- a/dahdi-linux.spec
+++ b/dahdi-linux.spec
@@ -35,7 +35,7 @@ exit 1
%define_enable_debug_packages 0
%endif
-%definerel 2
+%definerel 3
%definepname dahdi-linux
%defineFIRMWARE_URL
http://downloads.digium.com/pub/telephony/firmware/releases
Summary: DAHDI telephony device support
@@ -59,10 +59,9 @@ Source7: %{FIRMWARE_URL}/dahdi-fw-hx8-2.06.tar.gz
# Source7-md5: a7f3886942bb3e9fed349a41b3390c9f
Patch0:linux-3.18.patch
URL: http://www.asterisk.org/
-BuildRequires: rpmbuild(macros) = 1.678
%{?with_kernel:%{expand:%buildrequires_kernel
kernel%%{_alt_kernel}-module-build = 3:2.6.20.2}}
BuildRequires: perl-base
-BuildRequires: rpmbuild(macros) = 1.379
+BuildRequires: rpmbuild(macros) = 1.701
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
# Rules:
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dahdi-linux.git/commitdiff/fcd3b77f2ee888bc6838800f093860cd572f2a81
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/open-vm-tools] - updated kernel modules build system
commit fcf9412820e1f3ee7d9861affc6af1969efc
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:41:42 2015 +0100
- updated kernel modules build system
open-vm-tools.spec | 24 +++-
1 file changed, 7 insertions(+), 17 deletions(-)
---
diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index 455f1c1..1dc33c1 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -13,21 +13,11 @@
exit 1
%endif
-%if %{_alt_kernel} != %{nil}
-%if 0%{?build_kernels:1}
-%{error:alt_kernel and build_kernels are mutually exclusive}
-exit 1
-%endif
-%undefine with_userspace
-%global_build_kernels %{alt_kernel}
-%else
-%global_build_kernels
%{?build_kernels:,%{?build_kernels}}
+%if %{without userspace}
+# nothing to be placed to debuginfo package
+%define_enable_debug_packages 0
%endif
-%definekbrs%(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo BuildRequires:kernel%%{_alt_kernel}-module-build =
3:2.6.20.2 ; done)
-%definekpkg%(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo %%kernel_pkg ; done)
-%definebkpkg %(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo %%build_kernel_pkg ; done)
-
%definesnap2011.10.26
%definesubver %(echo %{snap} | tr -d .)
%definever 9.4.6
@@ -58,7 +48,7 @@ Patch4: %{pname}-linux-3.15.patch
Patch5:%{pname}-linux-3.16.patch
Patch6:%{pname}-linux-3.18.3.patch
URL: http://open-vm-tools.sourceforge.net/
-BuildRequires: rpmbuild(macros) = 1.679
+BuildRequires: rpmbuild(macros) = 1.701
%if %{with userspace}
BuildRequires: autoconf
BuildRequires: doxygen
@@ -87,7 +77,7 @@ Requires: libicu
Obsoletes: kernel-misc-pvscsi
Obsoletes: kernel-misc-vmmemctl
%endif
-%{?with_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%buildrequires_kernel
kernel%%{_alt_kernel}-module-build = 3:2.6.20.2}}
ExclusiveArch: %{ix86} %{x8664}
BuildRoot: %{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
@@ -296,7 +286,7 @@ export OVT_SOURCE_DIR=$PWD\
%endif\
%{nil}
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
%prep
#setup -q -n %{pname}-%{snap}-%{rev}
@@ -314,7 +304,7 @@ cp %{SOURCE1} packaging
%{__sed} -i -e 's|##{BUILD_OUTPUT}##|build|' docs/api/doxygen.conf
%build
-%{?with_kernel:%{expand:%bkpkg}}
+%{?with_kernel:%{expand:%build_kernel_packages}}
%if %{with userspace}
rm -rf autom4te.cache
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/open-vm-tools.git/commitdiff/764cd451f6c4a2b07789d30f33247523833cf476
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/open-vm-tools] - drop non-dist kernel support
commit 9082616213b774ef14b78841ca8700bec3400e39
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:40:20 2015 +0100
- drop non-dist kernel support
open-vm-tools.spec | 19 +--
1 file changed, 1 insertion(+), 18 deletions(-)
---
diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index e22d15b..455f1c1 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -1,14 +1,9 @@
#
# Conditional build:
%bcond_without kernel # without kernel modules
-%bcond_without dist_kernel # without distribution kernel
%bcond_without userspace # without userspace package
%bcond_withverbose # verbose build (V=1)
-%if %{without kernel}
-%undefine with_dist_kernel
-%endif
-
# The goal here is to have main, userspace, package built once with
# simple release number, and only rebuild kernel packages with kernel
# version as part of release number, without the need to bump release
@@ -92,7 +87,7 @@ Requires: libicu
Obsoletes: kernel-misc-pvscsi
Obsoletes: kernel-misc-vmmemctl
%endif
-%{?with_dist_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%kbrs}}
ExclusiveArch: %{ix86} %{x8664}
BuildRoot: %{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
@@ -147,10 +142,8 @@ Release: %{rel}@%{_kernel_ver_str}\
Group: Base/Kernel\
Requires(post,postun): /sbin/depmod\
Requires: dev = 2.9.0-7\
-%if %{with dist_kernel}\
%requires_releq_kernel\
Requires(postun): %releq_kernel\
-%endif\
\
%description -n kernel%{_alt_kernel}-misc-vmblock\
VMware vmblock Linux kernel module.\
@@ -165,10 +158,8 @@ Release: %{rel}@%{_kernel_ver_str}\
Group: Base/Kernel\
Requires(post,postun): /sbin/depmod\
Requires: dev = 2.9.0-7\
-%if %{with dist_kernel}\
%requires_releq_kernel\
Requires(postun): %releq_kernel\
-%endif\
\
%description -n kernel%{_alt_kernel}-misc-vmci\
VMware vmci Linux kernel module.\
@@ -183,10 +174,8 @@ Release: %{rel}@%{_kernel_ver_str}\
Group: Base/Kernel\
Requires(post,postun): /sbin/depmod\
Requires: dev = 2.9.0-7\
-%if %{with dist_kernel}\
%requires_releq_kernel\
Requires(postun): %releq_kernel\
-%endif\
\
%description -n kernel%{_alt_kernel}-misc-vmhgfs\
VMware vmhgfs Linux kernel module.\
@@ -201,10 +190,8 @@ Release: %{rel}@%{_kernel_ver_str}\
Group: Base/Kernel\
Requires(post,postun): /sbin/depmod\
Requires: dev = 2.9.0-7\
-%if %{with dist_kernel}\
%requires_releq_kernel\
Requires(postun): %releq_kernel\
-%endif\
\
%description -n kernel%{_alt_kernel}-misc-vmsync\
VMware vmsync Linux kernel module.\
@@ -219,10 +206,8 @@ Release: %{rel}@%{_kernel_ver_str}\
Group: Base/Kernel\
Requires(post,postun): /sbin/depmod\
Requires: dev = 2.9.0-7\
-%if %{with dist_kernel}\
%requires_releq_kernel\
Requires(postun): %releq_kernel\
-%endif\
\
%description -n kernel%{_alt_kernel}-misc-vmxnet\
VMware vmxnet Linux kernel module.\
@@ -237,10 +222,8 @@ Release: %{rel}@%{_kernel_ver_str}\
Group: Base/Kernel\
Requires(post,postun): /sbin/depmod\
Requires: dev = 2.9.0-7\
-%if %{with dist_kernel}\
%requires_releq_kernel\
Requires(postun): %releq_kernel\
-%endif\
\
%description -n kernel%{_alt_kernel}-misc-vsock\
VMware vsock Linux kernel module.\
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/open-vm-tools.git/commitdiff/764cd451f6c4a2b07789d30f33247523833cf476
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/vpb-driver] - drop non-dist kernel support
commit 75c79d0914ad16f7abc9ef1837b2fb93beb6806a
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:53:20 2015 +0100
- drop non-dist kernel support
vpb-driver.spec | 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
---
diff --git a/vpb-driver.spec b/vpb-driver.spec
index de676dc..ddc5c5b 100644
--- a/vpb-driver.spec
+++ b/vpb-driver.spec
@@ -1,15 +1,10 @@
#
# Conditional build:
-%bcond_without dist_kernel # without distribution kernel
%bcond_without kernel # don't build kernel modules
%bcond_without userspace # don't build userspace package
%bcond_without static_libs # don't build static libraries
%bcond_withpri # ISDN devices support (modified libpri)
-%if %{without kernel}
-%undefine with_dist_kernel
-%endif
-
# The goal here is to have main, userspace, package built once with
# simple release number, and only rebuild kernel packages with kernel
# version as part of release number, without the need to bump release
@@ -55,7 +50,7 @@ Source0:
http://www.voicetronix.com.au/Downloads/vpb-driver-4.x/%{pname}-%{versi
Patch0:%{pname}-make.patch
URL: http://www.voicetronix.com.au/downloads.htm#linux
BuildRequires: rpmbuild(macros) = 1.678
-%{?with_dist_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%kbrs}}
BuildRequires: autoconf = 2.59
BuildRequires: libstdc++-devel
BuildRequires: pciutils-devel
@@ -117,10 +112,8 @@ Release: %{rel}@%{_kernel_ver_str}\
License: GPL v2+\
Group: Base/Kernel\
Requires(post,postun): /sbin/depmod\
-%if %{with dist_kernel}\
%requires_releq_kernel\
Requires(postun): %releq_kernel\
-%endif\
\
%description -n kernel%{_alt_kernel}-telephony-vpb\
Linux kernel driver for Voicetronix Voice Processing Board (VPB).\
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vpb-driver.git/commitdiff/75d8015ca199909d77e539e41e59a087bc56a954
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xorg-driver-video-fglrx] - updated kernel modules build system
commit a87ce138d79f12d117ba2210666e706c2531b447
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 20:05:20 2015 +0100
- updated kernel modules build system
xorg-driver-video-fglrx.spec | 23 ---
1 file changed, 4 insertions(+), 19 deletions(-)
---
diff --git a/xorg-driver-video-fglrx.spec b/xorg-driver-video-fglrx.spec
index 4fad6f1..9807673 100644
--- a/xorg-driver-video-fglrx.spec
+++ b/xorg-driver-video-fglrx.spec
@@ -14,26 +14,11 @@
exit 1
%endif
-%if %{_alt_kernel} != %{nil}
-%if 0%{?build_kernels:1}
-%{error:alt_kernel and build_kernels are mutually exclusive}
-exit 1
-%endif
-%undefine with_userspace
-%global_build_kernels %{alt_kernel}
-%else
-%global_build_kernels
%{?build_kernels:,%{?build_kernels}}
-%endif
-
%if %{without userspace}
# nothing to be placed to debuginfo package
%define_enable_debug_packages 0
%endif
-%definekbrs%(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo BuildRequires:kernel%%{_alt_kernel}-module-build =
3:2.6.20.2 ; done)
-%definekpkg%(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo %%kernel_pkg ; done)
-%definebkpkg %(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo %%build_kernel_pkg ; done)
-
%ifarch %{ix86}
%definearch_sufix %{nil}
%definearch_dirx86
@@ -76,8 +61,8 @@ Patch5: %{pname}-GPL-only.patch
Patch6:%{pname}-intel_iommu.patch
Patch7:linux-3.17.patch
URL: http://ati.amd.com/support/drivers/linux/linux-radeon.html
-%{?with_kernel:%{expand:%kbrs}}
-BuildRequires: rpmbuild(macros) = 1.678
+%{?with_kernel:%{expand:%buildrequires_kernel
kernel%%{_alt_kernel}-module-build = 3:2.6.20.2}}
+BuildRequires: rpmbuild(macros) = 1.701
BuildRequires: sed = 4.0
Requires: %{pname}-libs = %{epoch}:%{version}-%{rel}
Requires: xorg-xserver-server
@@ -222,7 +207,7 @@ cp -pf common/lib/modules/fglrx/build_mod/2.6.x/Makefile
common/lib/modules/fglr
%install_kernel_modules -D installed -m
common/lib/modules/fglrx/build_mod/fglrx -d misc\
%{nil}
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
%prep
%setup -q -c
@@ -260,7 +245,7 @@ cp -a arch/%{arch_dir}/etc/* common/etc
%build
cd fglrx-%{intver}
-%{?with_kernel:%{expand:%bkpkg}}
+%{?with_kernel:%{expand:%build_kernel_packages}}
%install
rm -rf $RPM_BUILD_ROOT
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-fglrx.git/commitdiff/3423b049c6b551341c213ce19d18aeb0e604fcdc
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xorg-driver-video-fglrx] - rel 2
commit 3423b049c6b551341c213ce19d18aeb0e604fcdc
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 20:05:34 2015 +0100
- rel 2
xorg-driver-video-fglrx.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/xorg-driver-video-fglrx.spec b/xorg-driver-video-fglrx.spec
index 9807673..b1355de 100644
--- a/xorg-driver-video-fglrx.spec
+++ b/xorg-driver-video-fglrx.spec
@@ -31,7 +31,7 @@ exit 1
%definebetaver 1.0
#definerel 0.beta%{betaver}.3
-%definerel 1
+%definerel 2
%definepname xorg-driver-video-fglrx
Summary: Linux Drivers for AMD/ATI graphics accelerators
Summary(pl.UTF-8): Sterowniki do akceleratorów graficznych AMD/ATI
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-fglrx.git/commitdiff/3423b049c6b551341c213ce19d18aeb0e604fcdc
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xorg-driver-video-fglrx] - drop non-dist kernl support
commit ba60805919177e4eaa54d95fca1c00d249746d78
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 20:04:33 2015 +0100
- drop non-dist kernl support
xorg-driver-video-fglrx.spec | 11 +--
1 file changed, 1 insertion(+), 10 deletions(-)
---
diff --git a/xorg-driver-video-fglrx.spec b/xorg-driver-video-fglrx.spec
index 3f07327..4fad6f1 100644
--- a/xorg-driver-video-fglrx.spec
+++ b/xorg-driver-video-fglrx.spec
@@ -1,15 +1,10 @@
# Conditional build:
-%bcond_without dist_kernel # without distribution kernel
%bcond_without kernel # don't build kernel modules
%bcond_without userspace # don't build userspace tools
%bcond_withverbose # verbose build (V=1)
%definex11ver xpic
-%if %{without kernel}
-%undefine with_dist_kernel
-%endif
-
# The goal here is to have main, userspace, package built once with
# simple release number, and only rebuild kernel packages with kernel
# version as part of release number, without the need to bump release
@@ -81,7 +76,7 @@ Patch5: %{pname}-GPL-only.patch
Patch6:%{pname}-intel_iommu.patch
Patch7:linux-3.17.patch
URL: http://ati.amd.com/support/drivers/linux/linux-radeon.html
-%{?with_dist_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%kbrs}}
BuildRequires: rpmbuild(macros) = 1.678
BuildRequires: sed = 4.0
Requires: %{pname}-libs = %{epoch}:%{version}-%{rel}
@@ -198,10 +193,8 @@ Release: %{rel}@%{_kernel_ver_str}\
License: ATI\
Group: Base/Kernel\
Requires(post,postun): /sbin/depmod\
-%if %{with dist_kernel}\
%requires_releq_kernel\
Requires(postun): %releq_kernel\
-%endif\
Provides: kernel%{_alt_kernel}-video-firegl =
%{epoch}:%{version}-%{rel}@%{_kernel_ver_str}\
\
%description -n kernel%{_alt_kernel}-video-firegl\
@@ -244,11 +237,9 @@ cat common/lib/modules/fglrx/build_mod/2.6.x/Makefile
EOF
ln -s \$(LIBIP_PREFIX)/libfglrx_ip.a \$(M)
EOF
-%if %{with dist_kernel}
%patch0 -p1
%patch1 -p0
%patch2 -p0
-%endif
%patch3 -p1
%patch4 -p1
%patch5 -p1
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-fglrx.git/commitdiff/3423b049c6b551341c213ce19d18aeb0e604fcdc
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xtables-addons] - updated kernel modules build system
commit fbbd40f55bf1f8be16bb42f34bfc2cc5202b9e8e
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 20:15:45 2015 +0100
- updated kernel modules build system
xtables-addons.spec | 21 +++--
1 file changed, 3 insertions(+), 18 deletions(-)
---
diff --git a/xtables-addons.spec b/xtables-addons.spec
index 56d2d22..1ad2b9d 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -16,26 +16,11 @@
exit 1
%endif
-%if %{_alt_kernel} != %{nil}
-%if 0%{?build_kernels:1}
-%{error:alt_kernel and build_kernels are mutually exclusive}
-exit 1
-%endif
-%undefine with_userspace
-%global_build_kernels %{alt_kernel}
-%else
-%global_build_kernels
%{?build_kernels:,%{?build_kernels}}
-%endif
-
%if %{without userspace}
# nothing to be placed to debuginfo package
%define_enable_debug_packages 0
%endif
-%definekbrs%(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo BuildRequires:kernel%%{_alt_kernel}-module-build =
3:3.7.0 ; done)
-%definekpkg%(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo %%kernel_pkg ; done)
-%definebkpkg %(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo %%build_kernel_pkg ; done)
-
%definerel 1
%definepname xtables-addons
Summary: Additional extensions for xtables packet filtering system
@@ -51,7 +36,7 @@ URL: http://xtables-addons.sourceforge.net/
BuildRequires: autoconf = 2.65
BuildRequires: automake = 1:1.11
BuildRequires: iptables-devel = 1.4.5
-%{?with_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%buildrequires_kernel
kernel%%{_alt_kernel}-module-build = 3:3.7.0}}
BuildRequires: libtool
BuildRequires: pkgconfig = 0.9.0
BuildRequires: rpmbuild(macros) = 1.678
@@ -121,7 +106,7 @@ for drv in extensions/compat_xtables.ko
extensions/{ACCOUNT/,pknock/,}xt_*.ko ;
done\
%{nil}
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
%prep
%setup -q -n %{pname}-%{version}
@@ -130,7 +115,7 @@ done\
%configure \
--without-kbuild
-%{?with_kernel:%{expand:%bkpkg}}
+%{?with_kernel:%{expand:%build_kernel_packages}}
%if %{with userspace}
%{__make} \
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xtables-addons.git/commitdiff/2199654b9db1aa50de5b5ba63fb4766edb6db7c3
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xtables-addons] - rel 2
commit 2199654b9db1aa50de5b5ba63fb4766edb6db7c3 Author: Jan Rękorajski bagg...@pld-linux.org Date: Tue Jan 27 20:15:58 2015 +0100 - rel 2 xtables-addons.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/xtables-addons.spec b/xtables-addons.spec index 1ad2b9d..1ce4346 100644 --- a/xtables-addons.spec +++ b/xtables-addons.spec @@ -21,7 +21,7 @@ exit 1 %define_enable_debug_packages 0 %endif -%definerel 1 +%definerel 2 %definepname xtables-addons Summary: Additional extensions for xtables packet filtering system Summary(pl.UTF-8): Dodatkowe rozszerzenia do systemu filtrowania pakietów xtables gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xtables-addons.git/commitdiff/2199654b9db1aa50de5b5ba63fb4766edb6db7c3 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xtables-addons] - drop non-dist kernel support
commit d505eca38fb9f98e8abf40c27dfa2315ac4a4337
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 20:14:52 2015 +0100
- drop non-dist kernel support
xtables-addons.spec | 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
---
diff --git a/xtables-addons.spec b/xtables-addons.spec
index 8f00e6b..56d2d22 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -3,15 +3,10 @@
#
#
# Conditional build:
-%bcond_without dist_kernel # without distribution kernel
%bcond_without kernel # don't build kernel modules
%bcond_without userspace # don't build userspace tools
%bcond_withverbose # verbose build (V=1)
-%if %{without kernel}
-%undefine with_dist_kernel
-%endif
-
# The goal here is to have main, userspace, package built once with
# simple release number, and only rebuild kernel packages with kernel
# version as part of release number, without the need to bump release
@@ -56,7 +51,7 @@ URL: http://xtables-addons.sourceforge.net/
BuildRequires: autoconf = 2.65
BuildRequires: automake = 1:1.11
BuildRequires: iptables-devel = 1.4.5
-%{?with_dist_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%kbrs}}
BuildRequires: libtool
BuildRequires: pkgconfig = 0.9.0
BuildRequires: rpmbuild(macros) = 1.678
@@ -95,10 +90,8 @@ Requires:%{pname} = %{version}\
Suggests: xtables-geoip\
Conflicts: xtables-geoip 20090901-2\
Requires(post,postun): /sbin/depmod\
-%if %{with dist_kernel}\
%requires_releq_kernel\
Requires(postun): %releq_kernel\
-%endif\
\
%description -n kernel%{_alt_kernel}-net-xtables-addons\
Kernel modules for xtables addons.\
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xtables-addons.git/commitdiff/2199654b9db1aa50de5b5ba63fb4766edb6db7c3
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/crash] - update kernel modules build system
commit 7b1102588e1482c47c0aef81842f0cb7e8ff4e54
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:12:45 2015 +0100
- update kernel modules build system
crash.spec | 23 ---
1 file changed, 4 insertions(+), 19 deletions(-)
---
diff --git a/crash.spec b/crash.spec
index efc0cc6..e4d164f 100644
--- a/crash.spec
+++ b/crash.spec
@@ -15,26 +15,11 @@
exit 1
%endif
-%if %{_alt_kernel} != %{nil}
-%if 0%{?build_kernels:1}
-%{error:alt_kernel and build_kernels are mutually exclusive}
-exit 1
-%endif
-%undefine with_userspace
-%global_build_kernels %{alt_kernel}
-%else
-%global_build_kernels
%{?build_kernels:,%{?build_kernels}}
-%endif
-
%if %{without userspace}
# nothing to be placed to debuginfo package
%define_enable_debug_packages 0
%endif
-%definekbrs%(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo BuildRequires:kernel%%{_alt_kernel}-module-build =
3:2.6.20.2 ; done)
-%definekpkg%(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo %%kernel_pkg ; done)
-%definebkpkg %(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo %%build_kernel_pkg ; done)
-
%definerel 1
%definepname crash
Summary: Core Analysis Suite
@@ -50,8 +35,8 @@ Source0:
http://people.redhat.com/anderson/%{pname}-%{version}.tar.gz
Source1: eppic.tar.xz
# Source1-md5: a9f80ad71de9d6f5b77534a7ebdbed8e
URL: http://people.redhat.com/anderson/
-BuildRequires: rpmbuild(macros) = 1.678
-%{?with_kernel:%{expand:%kbrs}}
+BuildRequires: rpmbuild(macros) = 1.701
+%{?with_kernel:%{expand:%buildrequires_kernel
kernel%%{_alt_kernel}-module-build = 3:2.6.20.2}}
%if %{with userspace}
BuildRequires: ncurses-devel
BuildRequires: readline-devel
@@ -124,7 +109,7 @@ Ten pakiet zawiera sterownik pamięci /dev/crash do sesji
crash na\
%install_kernel_modules -D installed -m memory_driver/crash -d
kernel/drivers/char\
%{nil}
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
%prep
%setup -q -a1 -n %{pname}-%{version}
@@ -132,7 +117,7 @@ Ten pakiet zawiera sterownik pamięci /dev/crash do sesji
crash na\
%{__mv} eppic extensions
%build
-%{?with_kernel:%{expand:%bkpkg}}
+%{?with_kernel:%{expand:%build_kernel_packages}}
%if %{with userspace}
export CPPFLAGS=%{rpmcppflags} -I/usr/include/ncurses
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/crash.git/commitdiff/7b1102588e1482c47c0aef81842f0cb7e8ff4e54
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/nvidiabl] - rel 2
commit fb81d56e338b685b310fd843332def5431d3354a Author: Jan Rękorajski bagg...@pld-linux.org Date: Tue Jan 27 19:39:24 2015 +0100 - rel 2 nvidiabl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/nvidiabl.spec b/nvidiabl.spec index 2bbcde4..cec8581 100644 --- a/nvidiabl.spec +++ b/nvidiabl.spec @@ -8,7 +8,7 @@ %define_duplicate_files_terminate_build0 -%definerel 1 +%definerel 2 %definepname nvidiabl Summary: Linux driver for nVidia display back-lights Summary(pl.UTF-8): Sterownik dla Linuksa do podświetlania wyświetlacza dla kart firmy nVidia gitweb: http://git.pld-linux.org/gitweb.cgi/packages/nvidiabl.git/commitdiff/fb81d56e338b685b310fd843332def5431d3354a ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/nvidiabl] - updated kernel modules build system
commit d45709a3fc9e2951fa462f42d19ec404b3e0b76a
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:39:09 2015 +0100
- updated kernel modules build system
nvidiabl.spec | 22 --
1 file changed, 4 insertions(+), 18 deletions(-)
---
diff --git a/nvidiabl.spec b/nvidiabl.spec
index a448d48..2bbcde4 100644
--- a/nvidiabl.spec
+++ b/nvidiabl.spec
@@ -3,25 +3,11 @@
%bcond_without verbose # verbose build (V=1)
%bcond_without dkms# build dkms package
-%if %{_alt_kernel} != %{nil}
-%if 0%{?build_kernels:1}
-%{error:alt_kernel and build_kernels are mutually exclusive}
-exit 1
-%endif
-%global_build_kernels %{alt_kernel}
-%else
-%global_build_kernels
%{?build_kernels:,%{?build_kernels}}
-%endif
-
# nothing to be placed to debuginfo package
%define_enable_debug_packages 0
%define_duplicate_files_terminate_build0
-%definekbrs%(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo BuildRequires:kernel%%{_alt_kernel}-module-build =
3:2.6.20.2 ; done)
-%definekpkg%(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo %%kernel_pkg ; done)
-%definebkpkg %(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define
alt_kernel $n ; echo %%build_kernel_pkg ; done)
-
%definerel 1
%definepname nvidiabl
Summary: Linux driver for nVidia display back-lights
@@ -36,8 +22,8 @@ Source1: modprobe.conf
Patch0:nvidiabl-dkmsconf.patch
# Source0-md5: e9418d3e500172d79680e44ad0f85743
URL: https://github.com/guillaumezin/nvidiabl
-BuildRequires: rpmbuild(macros) = 1.678
-%{expand:%kbrs}
+BuildRequires: rpmbuild(macros) = 1.701
+%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build =
3:2.6.20.2}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -141,14 +127,14 @@ zalecany.\
%install_kernel_modules -D installed -m nvidiabl -d misc\
%{nil}
-%{expand:%kpkg}
+%{expand:%create_kernel_packages}
%prep
%setup -qn %{pname}-%{version}
%patch0 -p1
%build
-%{expand:%bkpkg}
+%{expand:%build_kernel_packages}
%install
rm -rf $RPM_BUILD_ROOT
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nvidiabl.git/commitdiff/fb81d56e338b685b310fd843332def5431d3354a
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
