[packages/php/PHP_5_6] use browscap package for browscap.ini data
commit 7330d6ec967e9ac78bfe157026dd837b3491be87
Author: Elan Ruusamäe g...@delfi.ee
Date: Tue Jan 27 13:55:09 2015 +0200
use browscap package for browscap.ini data
php.spec |14 +-
php_browscap.ini | 24778 -
2 files changed, 8 insertions(+), 24784 deletions(-)
---
diff --git a/php.spec b/php.spec
index 2191c39..cc05a97 100644
--- a/php.spec
+++ b/php.spec
@@ -134,7 +134,7 @@ ERROR: You need to select at least one Apache SAPI to build
shared modules.
%undefine with_filter
%endif
-%definerel 1
+%definerel 2
%defineorgname php
%definever_suffix 56
%definephp_suffix %{!?with_default_php:%{ver_suffix}}
@@ -156,8 +156,6 @@ Source2:%{orgname}-mod_%{orgname}.conf
Source3: %{orgname}-cgi-fcgi.ini
Source4: %{orgname}-apache.ini
Source5: %{orgname}-cli.ini
-# Taken from: http://browsers.garykeith.com/downloads.asp
-Source9: %{orgname}_browscap.ini
Source10: %{orgname}-fpm.init
Source11: %{orgname}-fpm.logrotate
Source12: %{orgname}-branch.sh
@@ -568,6 +566,7 @@ Provides: php(reflection)
Provides: php(standard)
%{!?with_mysqlnd:Obsoletes:%{name}-mysqlnd}
%{?with_pcre:%requires_ge_to pcre pcre-devel}
+Suggests: browscap
Obsoletes: php-common 4:5.3.28-7
Obsoletes: php-pecl-domxml
Conflicts: php4-common 3:4.4.4-8
@@ -2662,9 +2661,7 @@ echo .so php%{ver_suffix}.1
$RPM_BUILD_ROOT%{_mandir}/man1/php.1
ln -sf php%{ver_suffix} $RPM_BUILD_ROOT%{_bindir}/php
cp -p php.ini $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
-
cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.ini
-cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/browscap.ini
%if %{with apache1}
cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/apache/conf.d/70_mod_php.conf
@@ -2678,6 +2675,8 @@ cp -p %{SOURCE4}
$RPM_BUILD_ROOT%{_sysconfdir}/php-apache2handler.ini
%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/apache/libphp5.la
%endif
+%{__sed} -i -e 's#/etc/php/browscap.ini#/usr/share/browscap/php_browscap.ini#'
$RPM_BUILD_ROOT%{_sysconfdir}/php.ini
+
# ensure that paths are correct for current php version and arch
grep -El '/etc/php/|/usr/lib/php/' $RPM_BUILD_ROOT%{_sysconfdir}/*.ini | xargs
-r \
%{__sed} -i -e '
@@ -2813,6 +2812,10 @@ for f in /etc/php/*.ini.rpmsave
/etc/php/*.d/*.ini.rpmsave; do
' $nf
done
+%triggerpostun common -- %{name}-common 4:5.6.4-2, php-common 4:5.6.4-2
+# switch to browscap package if the ini file has original value
+%{__sed} -i -e
's#%{_sysconfdir}/browscap.ini#/usr/share/browscap/php_browscap.ini#'
%{_sysconfdir}/php.ini
+
# common macros called at extension post/postun scriptlet
%defineextension_scripts() \
%post %1 \
@@ -2982,7 +2985,6 @@ fi
%dir %{_sysconfdir}
%dir %{_sysconfdir}/conf.d
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php.ini
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/browscap.ini
%attr(755,root,root) %{_libdir}/libphp_common-*.so
%dir %{php_extensiondir}
diff --git a/php_browscap.ini b/php_browscap.ini
deleted file mode 100644
index 006be27..000
--- a/php_browscap.ini
+++ /dev/null
@@ -1,24778 +0,0 @@
-;;; Provided courtesy of https://browsers.garykeith.com
-;;; Created on Monday, July 30, 2012 at 8:00 PM UTC
-
-;;; Keep up with the latest goings-on with the project:
-;;; Follow us on Twitter https://twitter.com/browscap, or...
-;;; Like us on Facebook https://facebook.com/browscap, or...
-;;; Collaborate on GitHub https://github.com/GaryKeith/browscap, or...
-;;; Discuss on Google Groups https://groups.google.com/d/forum/browscap.
-
- Browscap Version
-
-[GJK_Browscap_Version]
-Version=5009
-Released=Mon, 30 Jul 2012 20:00:33 -
-
- DefaultProperties
-
-[DefaultProperties]
-Comment=DefaultProperties
-Browser=DefaultProperties
-Version=0.0
-MajorVer=0
-MinorVer=0
-Platform=unknown
-Platform_Version=unknown
-Alpha=false
-Beta=false
-Win16=false
-Win32=false
-Win64=false
-Frames=false
-IFrames=false
-Tables=false
-Cookies=false
-BackgroundSounds=false
-JavaScript=false
-VBScript=false
-JavaApplets=false
-ActiveXControls=false
-isMobileDevice=false
-isSyndicationReader=false
-Crawler=false
-CssVersion=0
-AolVersion=0
-
- Ask
-
-[Ask]
-Parent=DefaultProperties
-Comment=Ask
-Browser=Ask
-Frames=true
-IFrames=true
-Tables=true
-Crawler=true
-
-[Mozilla/?.0 (compatible; Ask Jeeves/Teoma*)]
-Parent=Ask
-Browser=Teoma
-
-[Mozilla/2.0 (compatible; Ask Jeeves)]
-Parent=Ask
-Browser=AskJeeves
-
- Baidu
-
-[Baidu]
-Parent=DefaultProperties
-Comment=Baidu
-Browser=Baidu
-Frames=true
-IFrames=true
-Tables=true
-Crawler=true
-
-[*Baiduspider*]
-Parent=Baidu
-Browser=BaiDu
-
-[*Baiduspider-ads*]
-Parent=Baidu
-Browser=Baidu Business search
-
[packages/php/PHP_5_4] make install not job safe
commit 2035da2369618978da5a7d4c0f93a54210e0b766
Author: Elan Ruusamäe g...@delfi.ee
Date: Wed Jan 21 15:42:02 2015 +0200
make install not job safe
php.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/php.spec b/php.spec
index c7b962e..bf01324 100644
--- a/php.spec
+++ b/php.spec
@@ -2394,7 +2394,7 @@ install -d
$RPM_BUILD_ROOT{%{_libdir}/{php,apache{,1}},%{_sysconfdir}/{apache,cg
cp -pf php_config.h.cli main/php_config.h
cp -pf Makefile.cli Makefile
-%{__make} install \
+%{__make} install -j1 \
phpbuilddir=%{_libdir}/%{name}/build \
INSTALL_ROOT=$RPM_BUILD_ROOT
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/2035da2369618978da5a7d4c0f93a54210e0b766
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php/PHP_5_4] use browscap package for browscap.ini data
commit 89d05c05ecd44ba8636256e15910d2295a8c677b
Author: Elan Ruusamäe g...@delfi.ee
Date: Tue Jan 27 14:28:44 2015 +0200
use browscap package for browscap.ini data
php.spec |14 +-
php_browscap.ini | 24778 -
2 files changed, 8 insertions(+), 24784 deletions(-)
---
diff --git a/php.spec b/php.spec
index bf01324..4f1fc88 100644
--- a/php.spec
+++ b/php.spec
@@ -124,7 +124,7 @@ ERROR: You need to select at least one Apache SAPI to build
shared modules.
%undefine with_filter
%endif
-%definerel 1
+%definerel 2
%defineorgname php
%definever_suffix 54
%definephp_suffix %{!?with_default_php:%{ver_suffix}}
@@ -146,8 +146,6 @@ Source2:%{orgname}-mod_%{orgname}.conf
Source3: %{orgname}-cgi-fcgi.ini
Source4: %{orgname}-apache.ini
Source5: %{orgname}-cli.ini
-# Taken from: http://browsers.garykeith.com/downloads.asp
-Source9: %{orgname}_browscap.ini
Source10: %{orgname}-fpm.init
Source11: %{orgname}-fpm.logrotate
Source12: %{orgname}-branch.sh
@@ -541,6 +539,7 @@ Provides: php(reflection)
Provides: php(standard)
%{!?with_mysqlnd:Obsoletes:php-mysqlnd}
%{?with_pcre:%requires_ge_to pcre pcre-devel}
+Suggests: browscap
Obsoletes: php-pecl-domxml
Conflicts: php4-common 3:4.4.4-8
Conflicts: rpm 4.4.2-0.2
@@ -2470,9 +2469,7 @@ echo .so php%{ver_suffix}.1
$RPM_BUILD_ROOT%{_mandir}/man1/php.1
ln -sf php%{ver_suffix} $RPM_BUILD_ROOT%{_bindir}/php
cp -p php.ini $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
-
cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.ini
-cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/browscap.ini
%if %{with apache1}
cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/apache/conf.d/70_mod_php.conf
@@ -2486,6 +2483,8 @@ cp -p %{SOURCE4}
$RPM_BUILD_ROOT%{_sysconfdir}/php-apache2handler.ini
%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/apache/libphp5.la
%endif
+%{__sed} -i -e 's#/etc/php/browscap.ini#/usr/share/browscap/php_browscap.ini#'
$RPM_BUILD_ROOT%{_sysconfdir}/php.ini
+
# ensure that paths are correct for current php version and arch
grep -El '/etc/php/|/usr/lib/php/' $RPM_BUILD_ROOT%{_sysconfdir}/*.ini | xargs
-r \
%{__sed} -i -e '
@@ -2602,6 +2601,10 @@ fi
[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
[ ! -f /etc/httpd/conf.d/??_mod_php.conf ] || %service -q httpd restart
+%triggerpostun common -- %{name}-common 4:5.4.36-2, php-common 4:5.4.36-2
+# switch to browscap package if the ini file has original value
+%{__sed} -i -e
's#%{_sysconfdir}/browscap.ini#/usr/share/browscap/php_browscap.ini#'
%{_sysconfdir}/php.ini
+
# common macros called at extension post/postun scriptlet
%defineextension_scripts() \
%post %1 \
@@ -2756,7 +2759,6 @@ fi
%dir %{_sysconfdir}
%dir %{_sysconfdir}/conf.d
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php.ini
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/browscap.ini
%attr(755,root,root) %{_libdir}/libphp_common-*.so
%dir %{php_extensiondir}
diff --git a/php_browscap.ini b/php_browscap.ini
deleted file mode 100644
index 006be27..000
--- a/php_browscap.ini
+++ /dev/null
@@ -1,24778 +0,0 @@
-;;; Provided courtesy of https://browsers.garykeith.com
-;;; Created on Monday, July 30, 2012 at 8:00 PM UTC
-
-;;; Keep up with the latest goings-on with the project:
-;;; Follow us on Twitter https://twitter.com/browscap, or...
-;;; Like us on Facebook https://facebook.com/browscap, or...
-;;; Collaborate on GitHub https://github.com/GaryKeith/browscap, or...
-;;; Discuss on Google Groups https://groups.google.com/d/forum/browscap.
-
- Browscap Version
-
-[GJK_Browscap_Version]
-Version=5009
-Released=Mon, 30 Jul 2012 20:00:33 -
-
- DefaultProperties
-
-[DefaultProperties]
-Comment=DefaultProperties
-Browser=DefaultProperties
-Version=0.0
-MajorVer=0
-MinorVer=0
-Platform=unknown
-Platform_Version=unknown
-Alpha=false
-Beta=false
-Win16=false
-Win32=false
-Win64=false
-Frames=false
-IFrames=false
-Tables=false
-Cookies=false
-BackgroundSounds=false
-JavaScript=false
-VBScript=false
-JavaApplets=false
-ActiveXControls=false
-isMobileDevice=false
-isSyndicationReader=false
-Crawler=false
-CssVersion=0
-AolVersion=0
-
- Ask
-
-[Ask]
-Parent=DefaultProperties
-Comment=Ask
-Browser=Ask
-Frames=true
-IFrames=true
-Tables=true
-Crawler=true
-
-[Mozilla/?.0 (compatible; Ask Jeeves/Teoma*)]
-Parent=Ask
-Browser=Teoma
-
-[Mozilla/2.0 (compatible; Ask Jeeves)]
-Parent=Ask
-Browser=AskJeeves
-
- Baidu
-
-[Baidu]
-Parent=DefaultProperties
-Comment=Baidu
-Browser=Baidu
-Frames=true
-IFrames=true
-Tables=true
-Crawler=true
-
-[*Baiduspider*]
-Parent=Baidu
-Browser=BaiDu
-
-[*Baiduspider-ads*]
[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
[packages/nvidiabl] - drop non-dist kernel support
commit 0169746bb7085611a91f6d551d4257d345f40884
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:38:07 2015 +0100
- drop non-dist kernel support
nvidiabl.spec | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
---
diff --git a/nvidiabl.spec b/nvidiabl.spec
index 83baa6c..a448d48 100644
--- a/nvidiabl.spec
+++ b/nvidiabl.spec
@@ -1,6 +1,5 @@
#
# Conditional build:
-%bcond_without dist_kernel # allow non-distribution kernel
%bcond_without verbose # verbose build (V=1)
%bcond_without dkms# build dkms package
@@ -38,7 +37,7 @@ Patch0: nvidiabl-dkmsconf.patch
# Source0-md5: e9418d3e500172d79680e44ad0f85743
URL: https://github.com/guillaumezin/nvidiabl
BuildRequires: rpmbuild(macros) = 1.678
-%{?with_dist_kernel:%{expand:%kbrs}}
+%{expand:%kbrs}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -103,10 +102,8 @@ Summary(pl.UTF-8): Sterownik dla Linuksa do podświetlania
wyświetlacza dla kar
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}-video-nvidiabl\
This driver drives the smartdimmer register found on modern mobile\
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/wl] - updated kernel modules build system
commit 87d5fa42f66ac5daca5ae888d81249f6b8512b32
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:56:22 2015 +0100
- updated kernel modules build system
wl.spec | 22 --
1 file changed, 4 insertions(+), 18 deletions(-)
---
diff --git a/wl.spec b/wl.spec
index a3221e2..ab201b8 100644
--- a/wl.spec
+++ b/wl.spec
@@ -3,23 +3,9 @@
%bcond_withverbose # verbose build (V=1)
%bcond_withdkms# 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
-%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 3
%definepname wl
%definefile_ver%(echo %{version} | tr . _)
@@ -39,8 +25,8 @@ Source3: dkms.conf
Patch0:linux-3.17.patch
Patch1:gcc-4.9.patch
URL: http://www.broadcom.com/support/802.11/linux_sta.php
-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}}
ExclusiveArch: %{ix86} %{x8664}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -107,7 +93,7 @@ EOF\
%install_kernel_modules -D installed -m wl -d kernel/drivers/net/wireless\
%{nil}
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
%prep
%ifarch %{x8664}
@@ -140,7 +126,7 @@ EXTRA_LDFLAGS :=
$(KBUILD_EXTMOD)/lib/wlc_hybrid.o_shipped
EOF
%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/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/wl] - drop non-dist kernl support
commit f989711a6868a7883210f8e972bf34cfc3ff898c
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:54:47 2015 +0100
- drop non-dist kernl support
wl.spec | 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
---
diff --git a/wl.spec b/wl.spec
index 5d57ac6..a3221e2 100644
--- a/wl.spec
+++ b/wl.spec
@@ -1,13 +1,8 @@
# Conditional build:
-%bcond_without dist_kernel # allow non-distribution kernel
%bcond_without kernel # don't build kernel modules
%bcond_withverbose # verbose build (V=1)
%bcond_withdkms# build dkms package
-%if %{without kernel}
-%undefine with_dist_kernel
-%endif
-
%if %{_alt_kernel} != %{nil}
%if 0%{?build_kernels:1}
%{error:alt_kernel and build_kernels are mutually exclusive}
@@ -45,7 +40,7 @@ Patch0: linux-3.17.patch
Patch1:gcc-4.9.patch
URL: http://www.broadcom.com/support/802.11/linux_sta.php
BuildRequires: rpmbuild(macros) = 1.678
-%{?with_dist_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%kbrs}}
ExclusiveArch: %{ix86} %{x8664}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -77,10 +72,8 @@ Summary: Broadcom 802.11 a/b/g/n hybrid Linux networking
device driver\
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-wl\
These packages contain Broadcom's IEEE 802.11a/b/g/n hybrid Linux\
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/linuxrdac] - drop non-dist kernel support
commit d9d9b4e04c72daf1d027995db1785d51c64fbf7a
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 20:20:57 2015 +0100
- drop non-dist kernel support
linuxrdac.spec | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
---
diff --git a/linuxrdac.spec b/linuxrdac.spec
index ebd1813..8bf9d30 100644
--- a/linuxrdac.spec
+++ b/linuxrdac.spec
@@ -1,6 +1,5 @@
#
# Conditional build:
-%bcond_without dist_kernel # allow non-distribution kernel
%bcond_withverbose # verbose build (V=1)
%if %{_alt_kernel} != %{nil}
@@ -35,7 +34,7 @@ Patch1: linuxrdac-linux-3.4.patch
Patch2:linuxrdac-linux-3.7.patch
#URL: -
BuildRequires: rpmbuild(macros) = 1.678
-%{?with_dist_kernel:%{expand:%kbrs}}
+%{expand:%kbrs}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -47,10 +46,8 @@ Summary: RDAC Multi-Path Proxy Driver for Linux\
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}-scsi-mpprdac\
RDAC Multi-Path Proxy Driver for Linux.\
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
[copy command] packages/gtkhtml - packages/gtkhtml3
___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/e1000e] - drop non-dist kernel support
commit af24afb188bd3812bcc615ab7286220d41435cd2
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:19:58 2015 +0100
- drop non-dist kernel support
e1000e.spec | 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
---
diff --git a/e1000e.spec b/e1000e.spec
index aaea83f..b5fae25 100644
--- a/e1000e.spec
+++ b/e1000e.spec
@@ -1,12 +1,7 @@
#
# Conditional build:
-%bcond_without dist_kernel # allow non-distribution kernel
%bcond_withverbose # verbose build (V=1)
-%if %{without kernel}
-%undefine with_dist_kernel
-%endif
-
%if %{_alt_kernel} != %{nil}
%if 0%{?build_kernels:1}
%{error:alt_kernel and build_kernels are mutually exclusive}
@@ -34,7 +29,7 @@ Source0:
http://downloads.sourceforge.net/e1000/%{pname}-%{version}.tar.gz
# Source0-md5: b8d770160691edd247a90070f45642ce
URL: http://downloads.sourceforge.net/e1000/
BuildRequires: rpm-build-macros = 1.678
-%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build =
3:2.6.20.2}
+%{?with_kernel:BuildRequires: kernel%{_alt_kernel}-module-build = 3:2.6.20.2}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -56,10 +51,8 @@ Summary(pl.UTF-8): Sterownik do karty Intel® PRO/1000e\
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-%{pname}\
This package contains the Linux driver for the Intel(R) PRO/1000\
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/e1000e.git/commitdiff/7ad0beb4f82390a0d9e37c458eb17a20e7c5dd21
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/e1000e] - updated kernel modules build system - rel 3
commit 7ad0beb4f82390a0d9e37c458eb17a20e7c5dd21
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:21:29 2015 +0100
- updated kernel modules build system
- rel 3
e1000e.spec | 26 ++
1 file changed, 6 insertions(+), 20 deletions(-)
---
diff --git a/e1000e.spec b/e1000e.spec
index b5fae25..ece6566 100644
--- a/e1000e.spec
+++ b/e1000e.spec
@@ -2,21 +2,7 @@
# 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
-
-%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)
-%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 2
+%definerel 3
%definepname e1000e
Summary: Intel(R) PRO/1000e driver for Linux
Summary(pl.UTF-8): Sterownik do karty Intel® PRO/1000e
@@ -28,8 +14,8 @@ Group:Base/Kernel
Source0:
http://downloads.sourceforge.net/e1000/%{pname}-%{version}.tar.gz
# Source0-md5: b8d770160691edd247a90070f45642ce
URL: http://downloads.sourceforge.net/e1000/
-BuildRequires: rpm-build-macros = 1.678
-%{?with_kernel:BuildRequires: kernel%{_alt_kernel}-module-build = 3:2.6.20.2}
+BuildRequires: rpm-build-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
@@ -93,7 +79,7 @@ alias e1000e e1000e-current\
EOF\
%{nil}
-%{expand:%kpkg}
+%{expand:%create_kernel_packages}
%prep
%setup -q -n %{pname}-%{version}
@@ -109,13 +95,13 @@ EOF
# add -DE1000E_NO_NAPI to disable NAPI
%build
-%{expand:%bkpkg}
+%{expand:%build_kernel_packages}
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT
-%{expand:%ikpkg}
+%{expand:%install_kernel_packages}
cp -a installed/* $RPM_BUILD_ROOT
%clean
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/e1000e.git/commitdiff/7ad0beb4f82390a0d9e37c458eb17a20e7c5dd21
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/lin_tape] - updated kernel module build system
commit 616d29c6c49afad85647599ff6a93e7b9dcec0a1
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:31:39 2015 +0100
- updated kernel module build system
lin_tape.spec | 25 -
1 file changed, 4 insertions(+), 21 deletions(-)
---
diff --git a/lin_tape.spec b/lin_tape.spec
index 06eba4a..6175445 100644
--- a/lin_tape.spec
+++ b/lin_tape.spec
@@ -1,25 +1,10 @@
#
# Conditional build:
-%bcond_without dist_kernel # allow non-distribution kernel
%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 1
%definepname lin_tape
Summary: IBM Tape SCSI Device Driver for Linux
@@ -35,8 +20,8 @@ Patch1: linux-3.10.patch
Patch2:insecure-perms.patch
# System Storage, Tape systems, Tape drivers and software, Tape device drivers
(Linux)
URL: http://www.ibm.com/support/fixcentral/
-BuildRequires: rpmbuild(macros) = 1.678
-%{?with_dist_kernel:%{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
@@ -50,10 +35,8 @@ Summary: IBM Tape SCSI Device Driver for Linux\
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}-scsi-lin_tape\
The IBM Tape Device Driver is a device driver that provides attachment\
@@ -77,7 +60,7 @@ compatible platforms.\
%install_kernel_modules -D installed -m lin_tape -d kernel/drivers/scsi\
%{nil}
-%{expand:%kpkg}
+%{expand:%create_kernel_packages}
%prep
%setup -q -n %{pname}-%{version}
@@ -104,7 +87,7 @@ proc=zSeries
%{__cp} -af Makefile.GPL Makefile
%build
-%{expand:%bkpkg}
+%{expand:%build_kernel_packages}
%install
rm -rf $RPM_BUILD_ROOT
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lin_tape.git/commitdiff/9cd78c592bcfce0b852e33b7f793c8eec4c901d9
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/lin_tape] - rel 2
commit 9cd78c592bcfce0b852e33b7f793c8eec4c901d9
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:31:54 2015 +0100
- rel 2
lin_tape.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/lin_tape.spec b/lin_tape.spec
index 6175445..7d33eff 100644
--- a/lin_tape.spec
+++ b/lin_tape.spec
@@ -5,7 +5,7 @@
# nothing to be placed to debuginfo package
%define_enable_debug_packages 0
-%definerel 1
+%definerel 2
%definepname lin_tape
Summary: IBM Tape SCSI Device Driver for Linux
Name: %{pname}%{_alt_kernel}
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lin_tape.git/commitdiff/9cd78c592bcfce0b852e33b7f793c8eec4c901d9
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/lttng-modules] - drop non-dist kernel support
commit 5c25139a893a57f41b3a132baaf588e1cf608bfd
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:34:47 2015 +0100
- drop non-dist kernel support
lttng-modules.spec | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
---
diff --git a/lttng-modules.spec b/lttng-modules.spec
index a88e22c..c78ad65 100644
--- a/lttng-modules.spec
+++ b/lttng-modules.spec
@@ -1,6 +1,5 @@
#
# Conditional build:
-%bcond_without dist_kernel # allow non-distribution kernel
%bcond_without allprobes # all probes build (some probes, e.g. fs, need
full kernel source)
%bcond_withverbose # verbose build (V=1)
@@ -35,7 +34,7 @@ Patch0: build.patch
Patch1:linux-3.17.patch
Patch2:linux-3.18.patch
URL: http://lttng.org/
-%if %{with dist_kernel}
+%if %{with kernel}
BuildRequires: kernel%{_alt_kernel}-module-build = 3:2.6.38
%{?with_allprobes:BuildRequires: kernel%{_alt_kernel}-source = 3:2.6.38}
%endif
@@ -55,10 +54,8 @@ Summary(pl.UTF-8): Moduły LTTng 2.x dla 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}-lttng\
LTTng 2.x modules for Linux kernel.\
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lttng-modules.git/commitdiff/5d4b3b87d13d8b75255c4b983ac5ae5a888e1825
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/spl] - drop non-dist kernel support
commit 0ae0e9937b3e5071c1308b1d3b988dbee4579c1c
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:45:58 2015 +0100
- drop non-dist kernel support
spl.spec | 11 +--
1 file changed, 1 insertion(+), 10 deletions(-)
---
diff --git a/spl.spec b/spl.spec
index 2001daf..47cff46 100644
--- a/spl.spec
+++ b/spl.spec
@@ -1,14 +1,9 @@
#
# 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
@@ -55,7 +50,7 @@ Patch0: linux-3.17.patch
Patch1:linux-3.18.patch
URL: http://zfsonlinux.org/
BuildRequires: rpmbuild(macros) = 1.678
-%{?with_dist_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%kbrs}}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -84,10 +79,8 @@ Summary(pl.UTF-8): Solaris Porting Layer - 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}-spl\
Solaris Porting Layer - Linux kernel modules.\
@@ -100,10 +93,8 @@ Summary:Solaris Porting Layer - Linux kernel headers\
Summary(pl.UTF-8): Solaris Porting Layer - 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-spl-common-devel\
-%endif\
\
%description -n kernel%{_alt_kernel}-spl-devel\
Solaris Porting Layer - Linux kernel headers configured for PLD\
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/spl.git/commitdiff/c2a266890cfb585d34cad2ef765a6427b69c1351
___
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-nvidia] - drop non-dist kernel support
commit fe7c9b1297a5b6172cf0b6deae99ed32bb3cbbf2
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 20:06:13 2015 +0100
- drop non-dist kernel support
xorg-driver-video-nvidia.spec | 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
---
diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index a9b2b17..7b39ce5 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -4,16 +4,11 @@
# - kernel-drm is required on never kernels. driver for kernel-longterm not
requires drm
#
# Conditional build:
-%bcond_without dist_kernel # without distribution kernel
%bcond_without kernel # without kernel packages
%bcond_without userspace # don't build userspace programs
%bcond_withsettings# package nvidia-settings here (GPL version of
same packaged from nvidia-settings.spec)
%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
@@ -69,7 +64,7 @@ Patch0: X11-driver-nvidia-GL.patch
Patch1:X11-driver-nvidia-desktop.patch
URL: http://www.nvidia.com/object/unix.html
BuildRequires: rpmbuild(macros) = 1.679
-%{?with_dist_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%kbrs}}
BuildRequires: sed = 4.0
BuildConflicts:XFree86-nvidia
Requires: %{pname}-libs = %{epoch}:%{version}-%{rel}
@@ -204,13 +199,11 @@ Release: %{rel}@%{_kernel_ver_str}\
Group: Base/Kernel\
Requires(post,postun): /sbin/depmod\
Requires: dev = 2.7.7-10\
-%if %{with dist_kernel}\
%requires_releq_kernel\
%if %{_kernel_version_code} = %{_kernel_version_magic 3 10 0}\
Requires: %{releq_kernel -n drm}\
%endif\
Requires(postun): %releq_kernel\
-%endif\
Requires: %{pname} = %{epoch}:%{version}\
Provides: X11-driver-nvidia(kernel)\
Obsoletes: XFree86-nvidia-kernel\
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-nvidia.git/commitdiff/31ecf2562e29025a49b7965f00a730025792a2b2
___
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-nvidia] - rel 2
commit 31ecf2562e29025a49b7965f00a730025792a2b2 Author: Jan Rękorajski bagg...@pld-linux.org Date: Tue Jan 27 20:07:20 2015 +0100 - rel 2 xorg-driver-video-nvidia.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 8b43602..6fcb639 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -25,7 +25,7 @@ exit 1 %defineno_install_post_check_so 1 -%definerel 1 +%definerel 2 %definepname xorg-driver-video-nvidia Summary: Linux Drivers for nVidia GeForce/Quadro Chips Summary(hu.UTF-8): Linux meghajtók nVidia GeForce/Quadro chipekhez gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-nvidia.git/commitdiff/31ecf2562e29025a49b7965f00a730025792a2b2 ___ 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-nvidia] - updated kernel modules build system
commit fb27eb94dfa62bb31a06853e5aaaca4abb5bc208
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 20:06:59 2015 +0100
- updated kernel modules build system
xorg-driver-video-nvidia.spec | 23 ---
1 file changed, 4 insertions(+), 19 deletions(-)
---
diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 7b39ce5..8b43602 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -18,17 +18,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
@@ -36,10 +25,6 @@ exit 1
%defineno_install_post_check_so 1
-%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 xorg-driver-video-nvidia
Summary: Linux Drivers for nVidia GeForce/Quadro Chips
@@ -63,8 +48,8 @@ Source5: 10-nvidia-modules.conf
Patch0:X11-driver-nvidia-GL.patch
Patch1:X11-driver-nvidia-desktop.patch
URL: http://www.nvidia.com/object/unix.html
-BuildRequires: rpmbuild(macros) = 1.679
-%{?with_kernel:%{expand:%kbrs}}
+BuildRequires: rpmbuild(macros) = 1.701
+%{?with_kernel:%{expand:%buildrequires_kernel
kernel%%{_alt_kernel}-module-build = 3:2.6.20.2}}
BuildRequires: sed = 4.0
BuildConflicts:XFree86-nvidia
Requires: %{pname}-libs = %{epoch}:%{version}-%{rel}
@@ -249,7 +234,7 @@ cd ..\
%install_kernel_modules -D installed -m kernel/nvidia -d misc\
%{nil}
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
%prep
cd %{_builddir}
@@ -266,7 +251,7 @@ rm -rf NVIDIA-Linux-x86*-%{version}*
echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused'
kernel/Makefile.kbuild
%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/xorg-driver-video-nvidia.git/commitdiff/31ecf2562e29025a49b7965f00a730025792a2b2
___
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/XTADDONS_1] - rel 43
commit 9c8de23f3845f732cfcf3f3be743294c7a2d4586 Author: Jan Rękorajski bagg...@pld-linux.org Date: Tue Jan 27 20:14:16 2015 +0100 - rel 43 xtables-addons.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/xtables-addons.spec b/xtables-addons.spec index f4be693..bd260f3 100644 --- a/xtables-addons.spec +++ b/xtables-addons.spec @@ -21,7 +21,7 @@ exit 1 %define_enable_debug_packages 0 %endif -%definerel 42 +%definerel 43 %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/9c8de23f3845f732cfcf3f3be743294c7a2d4586 ___ 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/XTADDONS_1] - updated kernel modules build system
commit 935ce4616e60736b0480bd63ca75cb78f559db67
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 20:14:02 2015 +0100
- updated kernel modules build system
xtables-addons.spec | 22 --
1 file changed, 4 insertions(+), 18 deletions(-)
---
diff --git a/xtables-addons.spec b/xtables-addons.spec
index ef2d10d..f4be693 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -16,25 +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
-%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 42
%definepname xtables-addons
Summary: Additional extensions for xtables packet filtering system
@@ -53,8 +39,8 @@ BuildRequires:automake = 1:1.11
BuildRequires: iptables-devel = 1.4.5
BuildRequires: libtool
BuildRequires: pkgconfig = 0.9.0
-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}}
BuildRequires: tar = 1.22
BuildRequires: xz
Requires: iptables = 1.4.5
@@ -123,7 +109,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}
@@ -138,7 +124,7 @@ done\
V=1
%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/xtables-addons.git/commitdiff/9c8de23f3845f732cfcf3f3be743294c7a2d4586
___
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/XTADDONS_1] - drop non-dist kernel support
commit 7f74adf44066b76f5689cf0096d24fa808c760f9
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 20:13:20 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 36ad0ab..ef2d10d 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
@@ -59,7 +54,7 @@ BuildRequires:iptables-devel = 1.4.5
BuildRequires: libtool
BuildRequires: pkgconfig = 0.9.0
BuildRequires: rpmbuild(macros) = 1.678
-%{?with_dist_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%kbrs}}
BuildRequires: tar = 1.22
BuildRequires: xz
Requires: iptables = 1.4.5
@@ -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/9c8de23f3845f732cfcf3f3be743294c7a2d4586
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/madwifi-ng] - updated kernel modules build system
commit 1406b2a007d0eb8c8202527eaed82440264633fc
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 20:20:16 2015 +0100
- updated kernel modules build system
madwifi-ng.spec | 23 ---
1 file changed, 4 insertions(+), 19 deletions(-)
---
diff --git a/madwifi-ng.spec b/madwifi-ng.spec
index 761bb98..149aa0b 100644
--- a/madwifi-ng.spec
+++ b/madwifi-ng.spec
@@ -17,26 +17,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)
-
%definesnap_year 2012
%definesnap_month 01
%definesnap_day31
@@ -72,8 +57,8 @@ Patch2: %{pname}-ticket-617.patch
Patch3:%{pname}-ieee80211-skb-update.patch
Patch4:format-security.patch
URL: http://madwifi-project.org/
-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}}
Provides: madwifi
Obsoletes: madwifi
ExclusiveArch: alpha arm %{ix86} %{x8664} mips powerpc ppc sparc sparcv9
sparc64 xscale
@@ -144,7 +129,7 @@ Ten pakiet zawiera moduł jądra Linuksa.\
%install_kernel_modules -D installed -m %{modules_ath},%{modules_wlan} -d
kernel/net\
%{nil}
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
%prep
%setup -q -n %{tname}-%{trunk}-%{snap}
@@ -174,7 +159,7 @@ Ten pakiet zawiera moduł jądra Linuksa.\
%define target powerpc-be-elf
%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/madwifi-ng.git/commitdiff/d6051d41a311127a29f765cc4a536564842e9305
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/madwifi-ng] - rel 78
commit d6051d41a311127a29f765cc4a536564842e9305
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 20:20:29 2015 +0100
- rel 78
madwifi-ng.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/madwifi-ng.spec b/madwifi-ng.spec
index 149aa0b..90ccfe3 100644
--- a/madwifi-ng.spec
+++ b/madwifi-ng.spec
@@ -30,7 +30,7 @@ exit 1
%defineprel0.%{snap}.%{rel}
%definetrunk r4177
-%definerel 77
+%definerel 78
%definepname madwifi-ng
%definetname madwifi-trunk
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/madwifi-ng.git/commitdiff/d6051d41a311127a29f765cc4a536564842e9305
___
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] - drop non-dist kernel support
commit 16c064e528a03aa8aba7912fa0227106849c52c5
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:14:04 2015 +0100
- drop non-dist kernel support
dahdi-linux.spec | 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
---
diff --git a/dahdi-linux.spec b/dahdi-linux.spec
index 0aa1002..0b3f534 100644
--- a/dahdi-linux.spec
+++ b/dahdi-linux.spec
@@ -11,7 +11,6 @@
# unpackaged module: drivers/dahdi/xpp/xpp_usb
#
# Conditional build:
-%bcond_without dist_kernel # without distribution kernel
%bcond_without kernel # don't build kernel modules
%bcond_withoslec # with Open Source Line Echo Canceller
%bcond_without xpp # without Astribank
@@ -22,10 +21,6 @@
%undefine with_xpp
%endif
-%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
@@ -80,7 +75,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_dist_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%kbrs}}
BuildRequires: perl-base
BuildRequires: rpmbuild(macros) = 1.379
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -126,11 +121,9 @@ Summary(pl.UTF-8): Sterownik DAHDI dla 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\
%{?with_oslec:Requires:kernel-misc-oslec =
20070608-0.1@%{_kernel_ver_str}}\
-%endif\
\
%description -n kernel%{_alt_kernel}-%{pname}\
DAHDI telephony Linux kernel driver.\
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/ipset] - updated kernel modules build system
commit 31575a1c7f5af72806a7b0215b01aeee649d69bc
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:27:37 2015 +0100
- updated kernel modules build system
ipset.spec | 31 ++-
1 file changed, 6 insertions(+), 25 deletions(-)
---
diff --git a/ipset.spec b/ipset.spec
index 0b24e64..cbf8c3c 100644
--- a/ipset.spec
+++ b/ipset.spec
@@ -4,15 +4,10 @@
#the dependencies here
#
# 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 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
@@ -22,26 +17,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 ipset
Summary: IP sets utility
@@ -63,8 +43,8 @@ BuildRequires:libltdl-devel = 2:2.0
BuildRequires: libtool = 2:2.0
%{?with_userspace:BuildRequires: linux-libc-headers = 7:2.6.38.6}
BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) = 1.678
-%{?with_dist_kernel:%{expand:%kbrs}}
+BuildRequires: rpmbuild(macros) = 1.701
+%{?with_kernel:%{expand:%buildrequires_kernel
kernel%%{_alt_kernel}-module-build = 3:2.6.20.2}}
Suggests: kernel-net-ipset
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -131,8 +111,9 @@ Summary:IPset kernel modules\
Summary(pl.UTF-8): Moduły jądra oferujące wsparcie dla zbiorów IP\
Release: %{rel}@%{_kernel_ver_str}\
Group: Base/Kernel\
-%{?with_dist_kernel:%requires_releq_kernel}\
Requires(post,postun): /sbin/depmod\
+%requires_releq_kernel\
+Requires(postun): %releq_kernel\
\
%description -n kernel%{_alt_kernel}-net-ipset\
IP sets are a framework inside the Linux 2.4.x and 2.6.x kernel, which\
@@ -187,7 +168,7 @@ for drv in kernel/net/netfilter/xt_*.ko ; do\
done\
%{nil}
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
%prep
%setup -q -n %{pname}-%{version}
@@ -202,7 +183,7 @@ done\
%{__make}
%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/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/lttng-modules] - updated kernel modules build system
commit 81cb42d35541b05f8c2154cd78c9172ef79fdb11
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:36:59 2015 +0100
- updated kernel modules build system
lttng-modules.spec | 25 +
1 file changed, 5 insertions(+), 20 deletions(-)
---
diff --git a/lttng-modules.spec b/lttng-modules.spec
index c78ad65..8359b20 100644
--- a/lttng-modules.spec
+++ b/lttng-modules.spec
@@ -3,22 +3,9 @@
%bcond_without allprobes # all probes build (some probes, e.g. fs, need
full kernel source)
%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
-%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 lttng-modules
Summary: LTTng 2.x kernel modules
@@ -34,11 +21,9 @@ Patch0: build.patch
Patch1:linux-3.17.patch
Patch2:linux-3.18.patch
URL: http://lttng.org/
-%if %{with kernel}
-BuildRequires: kernel%{_alt_kernel}-module-build = 3:2.6.38
-%{?with_allprobes:BuildRequires: kernel%{_alt_kernel}-source = 3:2.6.38}
-%endif
-BuildRequires: rpmbuild(macros) = 1.678
+%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build = 3:2.6.38}
+%{?with_allprobes:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-source
= 3:2.6.38}}
+BuildRequires: rpmbuild(macros) = 1.701
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -97,7 +82,7 @@ p=`pwd`\
KERNELDIR=%{_kernelsrcdir}\
%{nil}
-%{expand:%kpkg}
+%{expand:%create_kernel_packages}
%prep
%setup -q -n %{pname}-%{version}
@@ -106,7 +91,7 @@ p=`pwd`\
%patch2 -p1
%build
-%{expand:%bkpkg}
+%{expand:%build_kernel_packages}
%install
rm -rf $RPM_BUILD_ROOT
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lttng-modules.git/commitdiff/5d4b3b87d13d8b75255c4b983ac5ae5a888e1825
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/lttng-modules] - rel 2
commit 5d4b3b87d13d8b75255c4b983ac5ae5a888e1825 Author: Jan Rękorajski bagg...@pld-linux.org Date: Tue Jan 27 19:37:15 2015 +0100 - rel 2 lttng-modules.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/lttng-modules.spec b/lttng-modules.spec index 8359b20..423b244 100644 --- a/lttng-modules.spec +++ b/lttng-modules.spec @@ -6,7 +6,7 @@ # nothing to be placed to debuginfo package %define_enable_debug_packages 0 -%definerel 1 +%definerel 2 %definepname lttng-modules Summary: LTTng 2.x kernel modules Summary(pl.UTF-8): Moduły jądra LTTng 2.x gitweb: http://git.pld-linux.org/gitweb.cgi/packages/lttng-modules.git/commitdiff/5d4b3b87d13d8b75255c4b983ac5ae5a888e1825 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/r8168] - updated kernel modules build system
commit aadcf43b98ab76dc712f165f365d74ded3e4c71d
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:43:20 2015 +0100
- updated kernel modules build system
r8168.spec | 22 --
1 file changed, 4 insertions(+), 18 deletions(-)
---
diff --git a/r8168.spec b/r8168.spec
index 30bdf90..8ab2b6a 100644
--- a/r8168.spec
+++ b/r8168.spec
@@ -1,23 +1,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 2
%definepname r8168
Summary: Linux driver for RTL8111/8168B PCI Express Gigabit Ethernet
controllers
@@ -35,8 +21,8 @@ Source0: %{pname}-%{version}.tar.bz2
# Source0-md5: fe2962824587070a2ec53f77e40b0fea
Patch0:linux-3.15.patch
Patch1:linux-3.16.patch
-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}/%{pname}-%{version}-root-%(id -u -n)
%description
@@ -82,7 +68,7 @@ Express Gigabit Ethernet.\
%install_kernel_modules -D installed -m src/r8168 -d kernel/drivers/net\
%{nil}
-%{expand:%kpkg}
+%{expand:%create_kernel_packages}
%prep
%setup -q -n %{pname}-%{version}
@@ -90,7 +76,7 @@ Express Gigabit Ethernet.\
%patch1 -p1
%build
-%{expand:%bkpkg}
+%{expand:%build_kernel_packages}
%install
rm -rf $RPM_BUILD_ROOT
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/r8168.git/commitdiff/f5b3b652c159c9c7624652f135796a9059834c67
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/r8168] - drop non-dist kernel support
commit 686d3d090903ad7aea432c72d31162ce508cc5ce
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:42:30 2015 +0100
- drop non-dist kernel support
r8168.spec | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
---
diff --git a/r8168.spec b/r8168.spec
index d2f1347..30bdf90 100644
--- a/r8168.spec
+++ b/r8168.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}
@@ -37,7 +36,7 @@ Source0: %{pname}-%{version}.tar.bz2
Patch0:linux-3.15.patch
Patch1:linux-3.16.patch
BuildRequires: rpmbuild(macros) = 1.678
-%{?with_dist_kernel:%{expand:%kbrs}}
+%{expand:%kbrs}
BuildRoot: %{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
%description
@@ -55,10 +54,8 @@ Summary(pl.UTF-8): Moduł jądra Linuksa dla kart sieciowych
RTL8111/8168B PCI E
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-r8168\
Driver (Linux kernel module) for RTL8111/8168B PCI Express Gigabit\
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/r8168.git/commitdiff/f5b3b652c159c9c7624652f135796a9059834c67
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/r8168] - rel 3
commit f5b3b652c159c9c7624652f135796a9059834c67 Author: Jan Rękorajski bagg...@pld-linux.org Date: Tue Jan 27 19:43:32 2015 +0100 - rel 3 r8168.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/r8168.spec b/r8168.spec index 8ab2b6a..6f1c8f4 100644 --- a/r8168.spec +++ b/r8168.spec @@ -4,7 +4,7 @@ # nothing to be placed to debuginfo package %define_enable_debug_packages 0 -%definerel 2 +%definerel 3 %definepname r8168 Summary: Linux driver for RTL8111/8168B PCI Express Gigabit Ethernet controllers Summary(pl.UTF-8): Linuksowy sterownik dla kart sieciowych RTL8111/8168B PCI Express Gigabit Ethernet gitweb: http://git.pld-linux.org/gitweb.cgi/packages/r8168.git/commitdiff/f5b3b652c159c9c7624652f135796a9059834c67 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/tpm_emulator] - updated kernel modules build system
commit 0b135ccf32d0bde78b0c167d3463e2632a7cab68
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:49:41 2015 +0100
- updated kernel modules build system
tpm_emulator.spec | 23 ---
1 file changed, 4 insertions(+), 19 deletions(-)
---
diff --git a/tpm_emulator.spec b/tpm_emulator.spec
index 33739ea..eb41d9b 100644
--- a/tpm_emulator.spec
+++ b/tpm_emulator.spec
@@ -13,17 +13,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
@@ -31,10 +20,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 ; 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 tpm_emulator
%definerel 10
Summary: Software-based TPM and MTM Emulator
@@ -50,8 +35,8 @@ Patch0: %{pname}-libdir.patch
URL: http://tpm-emulator.berlios.de/
BuildRequires: cmake = 2.4
BuildRequires: gmp-devel
-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}}
Requires: %{name}-libs = %{version}-%{rel}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -132,7 +117,7 @@ przekazujący odebrane polecenia do tpmd.\
%install_kernel_modules -D installed -m tpmd_dev/linux/tpmd_dev -d misc\
%{nil}
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
%prep
%setup -q -n %{pname}-%{version}
@@ -152,7 +137,7 @@ cd ..
%if %{with kernel}
ln -sf ../../build/config.h tpmd_dev/linux/config.h
%{__make} -C tpmd_dev/linux tpmd_dev.rules
-%{expand:%bkpkg}
+%{expand:%build_kernel_packages}
%endif
%install
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tpm_emulator.git/commitdiff/9799b8e20e04dd718272198dd05b8750d14bb3be
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/tpm_emulator] - rel 11
commit 9799b8e20e04dd718272198dd05b8750d14bb3be
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:50:00 2015 +0100
- rel 11
tpm_emulator.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/tpm_emulator.spec b/tpm_emulator.spec
index eb41d9b..0cef834 100644
--- a/tpm_emulator.spec
+++ b/tpm_emulator.spec
@@ -21,7 +21,7 @@ exit 1
%define_duplicate_files_terminate_build0
%definepname tpm_emulator
-%definerel 10
+%definerel 11
Summary: Software-based TPM and MTM Emulator
Summary(pl.UTF-8): Programowy emulator TPM i MTM
Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tpm_emulator.git/commitdiff/9799b8e20e04dd718272198dd05b8750d14bb3be
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/tpm_emulator] - drop non-dist kernel support
commit 0f8a9f1f31d873b0fe61c17633771e145c2e017a
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:48:14 2015 +0100
- drop non-dist kernel support
tpm_emulator.spec | 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
---
diff --git a/tpm_emulator.spec b/tpm_emulator.spec
index 75b1113..33739ea 100644
--- a/tpm_emulator.spec
+++ b/tpm_emulator.spec
@@ -1,14 +1,9 @@
#
# Conditional build:
-%bcond_without dist_kernel # without distribution kernel
%bcond_without kernel # don't build kernel modules
%bcond_without userspace # don't build userspace packages
%bcond_withverbose # verbose kernel module build
#
-%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://tpm-emulator.berlios.de/
BuildRequires: cmake = 2.4
BuildRequires: gmp-devel
BuildRequires: rpmbuild(macros) = 1.678
-%{?with_dist_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%kbrs}}
Requires: %{name}-libs = %{version}-%{rel}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -107,10 +102,8 @@ Summary: Kernel module that provides /dev/tpm device\
Summary(pl.UTF-8): Moduł jądra udostępniający urządzenie /dev/tpm\
Release: %{rel}@%{_kernel_ver_str}\
Group: Base/Kernel\
-%if %{with dist_kernel}\
%requires_releq_kernel\
Requires(postun): %releq_kernel\
-%endif\
\
%description -n kernel%{_alt_kernel}-char-tpmd\
Kernel module that provides /dev/tpm device for backward compatibility\
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tpm_emulator.git/commitdiff/9799b8e20e04dd718272198dd05b8750d14bb3be
___
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] - updated kernel modules build system
commit 8fd9c3e56c38dee0e4a02fd11aafb23e1e83b120
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:54:08 2015 +0100
- updated kernel modules build system
vpb-driver.spec | 23 ---
1 file changed, 4 insertions(+), 19 deletions(-)
---
diff --git a/vpb-driver.spec b/vpb-driver.spec
index ddc5c5b..3c52a3a 100644
--- a/vpb-driver.spec
+++ b/vpb-driver.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 ; 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 8
%definepname vpb-driver
Summary: Voicetronix voice processing board (VPB) driver software
@@ -49,8 +34,8 @@ Source0:
http://www.voicetronix.com.au/Downloads/vpb-driver-4.x/%{pname}-%{versi
# Source0-md5: 35d0ea8ab7a6bda267603ca7c9b78671
Patch0:%{pname}-make.patch
URL: http://www.voicetronix.com.au/downloads.htm#linux
-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}}
BuildRequires: autoconf = 2.59
BuildRequires: libstdc++-devel
BuildRequires: pciutils-devel
@@ -149,7 +134,7 @@ p=`pwd`\
KSRC=%{_kernelsrcdir}\
%{nil}
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
%prep
%setup -q -n %{pname}-%{version}
@@ -186,7 +171,7 @@ cd ..
VPATH=%{_libdir}
%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/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/vpb-driver] - rel 9
commit 75d8015ca199909d77e539e41e59a087bc56a954 Author: Jan Rękorajski bagg...@pld-linux.org Date: Tue Jan 27 19:54:21 2015 +0100 - rel 9 vpb-driver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/vpb-driver.spec b/vpb-driver.spec index 3c52a3a..9b7e10c 100644 --- a/vpb-driver.spec +++ b/vpb-driver.spec @@ -21,7 +21,7 @@ exit 1 %define_duplicate_files_terminate_build0 -%definerel 8 +%definerel 9 %definepname vpb-driver Summary: Voicetronix voice processing board (VPB) driver software Summary(pl.UTF-8): Oprogramowanie sterowników dla kart przetwarzających głos (VPB) Voicetronix 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/linuxrdac] - rel 66
commit bcde9f2d58994ec18822cc9486e85ff7fef32aab
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 20:22:02 2015 +0100
- rel 66
linuxrdac.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/linuxrdac.spec b/linuxrdac.spec
index 4e850c7..a6a1b4e 100644
--- a/linuxrdac.spec
+++ b/linuxrdac.spec
@@ -5,7 +5,7 @@
# nothing to be placed to debuginfo package
%define_enable_debug_packages 0
-%definerel 65
+%definerel 66
%definepname linuxrdac
Summary: RDAC Multi-Path Proxy Driver for Linux
Name: %{pname}%{_alt_kernel}
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
DISTFILES: lttng-tools: lttng-tools-2.6.0.tar.bz2
Request by: qboosh Files fetched: 1 STORED: http://lttng.org/files/lttng-tools/lttng-tools-2.6.0.tar.bz2 0478f60395f9564b4a19f45ce7b7f3df lttng-tools-2.6.0.tar.bz2 Size: 921098 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/lttng-tools] - updated to 2.6.0
commit 3e574660e446cdc29b1530f90c355c86c730f672
Author: Jakub Bogusz qbo...@pld-linux.org
Date: Tue Jan 27 20:36:38 2015 +0100
- updated to 2.6.0
lttng-tools.spec | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/lttng-tools.spec b/lttng-tools.spec
index a32e656..86e50a5 100644
--- a/lttng-tools.spec
+++ b/lttng-tools.spec
@@ -1,16 +1,17 @@
Summary: LTTng Trace Control
Summary(pl.UTF-8): Sterowanie śledzeniem LTTng
Name: lttng-tools
-Version: 2.5.1
+Version: 2.6.0
Release: 1
License: LGPL v2.1+ (library), GPL v2 (tools)
Group: Libraries
Source0: http://lttng.org/files/lttng-tools/%{name}-%{version}.tar.bz2
-# Source0-md5: 3217abf182c8d2d7034fed3e0cd1b93c
+# Source0-md5: 0478f60395f9564b4a19f45ce7b7f3df
Patch0:%{name}-python.patch
URL: http://lttng.org/
BuildRequires: autoconf = 2.50
BuildRequires: automake = 1:1.10
+BuildRequires: kmod-devel
BuildRequires: libtool = 2:2.2
BuildRequires: libuuid-devel
BuildRequires: libxml2-devel = 1:2.7.6
@@ -19,11 +20,11 @@ BuildRequires: popt-devel = 1.13
BuildRequires: python-devel
BuildRequires: rpmbuild(macros) = 1.219
BuildRequires: swig-python = 2.0.0
-BuildRequires: userspace-rcu-devel = 0.7.2
+BuildRequires: userspace-rcu-devel = 0.8.0
#BuildRequires:jdk java-lttng-ust # used for tests only
Requires: libxml2 = 1:2.7.6
Requires: popt = 1.13
-Requires: userspace-rcu = 0.7.2
+Requires: userspace-rcu = 0.8.0
Requires: uname(release) = 2.6.27
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -38,10 +39,11 @@ Summary:Header files for LTTng control library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki sterującej LTTng
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: kmod-devel
Requires: libuuid-devel
Requires: libxml2-devel = 1:2.7.6
Requires: popt-devel = 1.13
-Requires: userspace-rcu-devel = 0.7.2
+Requires: userspace-rcu-devel = 0.8.0
%description devel
Header files for LTTng control library.
@@ -122,7 +124,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc ChangeLog LICENSE README TODO
doc/{calibrate,quickstart,streaming-howto}.txt
+%doc ChangeLog LICENSE README.md TODO
doc/{calibrate,quickstart,streaming-howto}.txt
%attr(755,root,root) %{_bindir}/lttng
%attr(755,root,root) %{_bindir}/lttng-relayd
%attr(755,root,root) %{_bindir}/lttng-sessiond
@@ -152,7 +154,7 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/lttng/save.h
%{_includedir}/lttng/session.h
%{_includedir}/lttng/snapshot.h
-%{_includedir}/lttng/version.h
+%{_includedir}/lttng/version.h.tmpl
%{_pkgconfigdir}/lttng-ctl.pc
%files static
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lttng-tools.git/commitdiff/3e574660e446cdc29b1530f90c355c86c730f672
___
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] - updated to 2.6.0 - updated link patch - added java patch (make .class files before using javah)
commit 5afbdfe9318a989f89cc8c6d539b796cf7056e3d
Author: Jakub Bogusz qbo...@pld-linux.org
Date: Tue Jan 27 19:12:58 2015 +0100
- updated to 2.6.0
- updated link patch
- added java patch (make .class files before using javah)
lttng-ust-java.patch | 11 +++
lttng-ust-link.patch | 43 ---
lttng-ust.spec | 32 +---
3 files changed, 56 insertions(+), 30 deletions(-)
---
diff --git a/lttng-ust.spec b/lttng-ust.spec
index f091544..eb05d90 100644
--- a/lttng-ust.spec
+++ b/lttng-ust.spec
@@ -6,21 +6,26 @@
Summary: LTTng Userspace Tracer
Summary(pl.UTF-8): LTTng Userspace Tracer - narzędzia LTTng do śledzenia
przestrzeni użytkownika
Name: lttng-ust
-Version: 2.5.1
+Version: 2.6.0
Release: 1
License: LGPL v2.1 (library), MIT (headers), GPL v2 (programs)
Group: Libraries
Source0: http://lttng.org/files/lttng-ust/%{name}-%{version}.tar.bz2
-# Source0-md5: d551d601bdc1a9285e1cd6c5728fb803
+# Source0-md5: 74ad4826eac76c9dbf50fd3e46523191
Patch0:%{name}-link.patch
+Patch1:%{name}-java.patch
URL: http://lttng.org/ust
BuildRequires: autoconf = 2.50
BuildRequires: automake
-%{?with_java:BuildRequires:jdk}
BuildRequires: rpmbuild(macros) = 1.294
BuildRequires: libtool = 2:2
%{?with_systemtap:BuildRequires: systemtap-sdt-devel}
BuildRequires: userspace-rcu-devel = 0.7.2
+%if %{with java}
+BuildRequires: java-log4j
+BuildRequires: jdk
+BuildRequires: jpackage-utils
+%endif
Requires: userspace-rcu = 0.7.2
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -75,6 +80,7 @@ Interfejs JNI do biblioteki LTTng Userspace Tracer.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%{__libtoolize}
@@ -82,10 +88,11 @@ Interfejs JNI do biblioteki LTTng Userspace Tracer.
%{__autoconf}
%{__autoheader}
%{__automake}
-export CLASSPATH=.
+export CLASSPATH=.:%{_javadir}/log4j.jar
%configure \
+ %{?with_java:JAVAC=%{javac}} \
--disable-silent-rules \
- %{?with_java:--with-java-jdk=%{java_home} --with-jni-interface} \
+ %{?with_java:--enable-jni-interface --enable-java-agent-all} \
%{?with_systemtap:--with-sdt}
%{__make}
@@ -102,12 +109,10 @@ rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_examplesdir}
%{__mv} $RPM_BUILD_ROOT%{_docdir}/lttng-ust/examples
$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
# packaged as %doc
-%{__rm}
$RPM_BUILD_ROOT%{_docdir}/lttng-ust/{ChangeLog,README,java-util-logging.txt}
+%{__rm}
$RPM_BUILD_ROOT%{_docdir}/lttng-ust/{ChangeLog,README.md,java-agent.txt}
%if %{with java}
-install -d $RPM_BUILD_ROOT%{_javadir}
-cp -p liblttng-ust-java/liblttng-ust-java.jar $RPM_BUILD_ROOT%{_javadir}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/liblttng-ust-{java,jul-jni}.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/liblttng-ust-{java,jul-jni,log4j-jni}.{la,a}
%endif
%clean
@@ -121,7 +126,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc COPYING ChangeLog README
+%doc COPYING ChangeLog README.md
%attr(755,root,root) %{_libdir}/liblttng-ust.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/liblttng-ust.so.0
%attr(755,root,root) %{_libdir}/liblttng-ust-ctl.so.*.*.*
@@ -185,13 +190,18 @@ rm -rf $RPM_BUILD_ROOT
%if %{with java}
%files -n java-lttng-ust
%defattr(644,root,root,755)
-%doc doc/java-util-logging.txt
+%doc doc/java-agent.txt
%attr(755,root,root) %{_libdir}/liblttng-ust-java.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-java.so.0
%attr(755,root,root) %{_libdir}/liblttng-ust-java.so
%attr(755,root,root) %{_libdir}/liblttng-ust-jul-jni.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-jul-jni.so.0
%attr(755,root,root) %{_libdir}/liblttng-ust-jul-jni.so
+%attr(755,root,root) %{_libdir}/liblttng-ust-log4j-jni.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-log4j-jni.so.0
+%attr(755,root,root) %{_libdir}/liblttng-ust-log4j-jni.so
+%{_javadir}/liblttng-ust-agent-1.0.0.jar
+%{_javadir}/liblttng-ust-agent.jar
%{_javadir}/liblttng-ust-java.jar
%{_javadir}/liblttng-ust-jul.jar
%endif
diff --git a/lttng-ust-java.patch b/lttng-ust-java.patch
new file mode 100644
index 000..671b775
--- /dev/null
+++ b/lttng-ust-java.patch
@@ -0,0 +1,11 @@
+--- lttng-ust-2.6.0/liblttng-ust-java/Makefile.am.orig 2015-01-27
16:26:04.867994970 +0100
lttng-ust-2.6.0/liblttng-ust-java/Makefile.am 2015-01-27
17:05:53.134561412 +0100
+@@ -19,7 +19,7 @@
+
+ org_lttng_ust_LTTngUst.h: jni-header.stamp
+
+-jni-header.stamp: $(dist_noinst_JAVA)
++jni-header.stamp: classnoinst.stamp
+ $(JAVAH) -classpath $(srcdir) $(JAVAHFLAGS) org.lttng.ust.LTTngUst \
+ echo JNI header generated jni-header.stamp
+
diff --git a/lttng-ust-link.patch b/lttng-ust-link.patch
index 44e502e..6ae97a2 100644
--- a/lttng-ust-link.patch
+++ b/lttng-ust-link.patch
@@ -1,14 +1,3 @@
DISTFILES: lttng-ust: lttng-ust-2.6.0.tar.bz2
Request by: qboosh Files fetched: 1 STORED: http://lttng.org/files/lttng-ust/lttng-ust-2.6.0.tar.bz2 74ad4826eac76c9dbf50fd3e46523191 lttng-ust-2.6.0.tar.bz2 Size: 614692 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/igb] - rel 2
commit a5730afb564aafe018c035deca17bf1cca41fb3d Author: Jan Rękorajski bagg...@pld-linux.org Date: Tue Jan 27 19:24:30 2015 +0100 - rel 2 igb.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/igb.spec b/igb.spec index 3e612b6..05af681 100644 --- a/igb.spec +++ b/igb.spec @@ -6,7 +6,7 @@ %define_duplicate_files_terminate_build0 -%definerel 1 +%definerel 2 %definepname igb Summary: Intel(R) PRO/1000 driver for Linux Summary(pl.UTF-8): Sterownik do karty Intel(R) PRO/1000 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/igb.git/commitdiff/a5730afb564aafe018c035deca17bf1cca41fb3d ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/igb] - drop non-dist kernel support
commit e5bfe24c2d1c01dc288871af6e71977df8460e53
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:22:35 2015 +0100
- drop non-dist kernel support
igb.spec | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
---
diff --git a/igb.spec b/igb.spec
index 2f6f59a..b2f96ee 100644
--- a/igb.spec
+++ b/igb.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}
@@ -33,7 +32,7 @@ Group:Base/Kernel
Source0:
http://downloads.sourceforge.net/e1000/%{pname}-%{version}.tar.gz
# Source0-md5: b59b8d5ae7d8f53f3481004051fb7b87
URL: http://sourceforge.net/projects/e1000/
-%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build =
3:2.6.20.2}
+%{?with_kernel:BuildRequires: kernel%{_alt_kernel}-module-build = 3:2.6.20.2}
BuildRequires: rpm-build-macros = 1.678
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -52,10 +51,8 @@ Summary(pl.UTF-8): Sterownik do karty Intel(R) PRO/1000\
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-igb\
This package contains the Linux driver for the Intel(R) PRO/1000\
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/igb.git/commitdiff/a5730afb564aafe018c035deca17bf1cca41fb3d
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ixgbe] - update kernel modules build system
commit f05fb15a45d5ef3147b709a5673e5d873426d042
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:29:40 2015 +0100
- update kernel modules build system
ixgbe.spec | 24 +---
1 file changed, 5 insertions(+), 19 deletions(-)
---
diff --git a/ixgbe.spec b/ixgbe.spec
index 8c40d40..1e1843f 100644
--- a/ixgbe.spec
+++ b/ixgbe.spec
@@ -1,23 +1,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
-%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)
-%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
%definepname ixgbe
Summary: Intel(R) 10 Gigabit driver for Linux
@@ -30,8 +16,8 @@ Group:Base/Kernel
Source0:
http://downloads.sourceforge.net/e1000/%{pname}-%{version}.tar.gz
# Source0-md5: bf70143cd1060698050745b212a1523e
URL: http://sourceforge.net/projects/e1000/
-%{?with_kernel:BuildRequires: kernel%{_alt_kernel}-module-build = 3:2.6.20.2}
-BuildRequires: rpmbuild(macros) = 1.678
+%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build =
3:2.6.20.2}
+BuildRequires: rpmbuild(macros) = 1.701
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -87,7 +73,7 @@ alias ixgbe ixgbe-current\
EOF\
%{nil}
-%{expand:%kpkg}
+%{expand:%create_kernel_packages}
%prep
%setup -q -n %{pname}-%{version}
@@ -107,13 +93,13 @@ EXTRA_CFLAGS+=-DIXGBE_PTP
EOF
%build
-%{expand:%bkpkg}
+%{expand:%build_kernel_packages}
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT
-%{expand:%ikpkg}
+%{expand:%install_kernel_packages}
cp -a installed/* $RPM_BUILD_ROOT
%clean
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ixgbe.git/commitdiff/4c38240027d5681656632631f8eac81575912b1b
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ixgbe] - rel 2
commit 4c38240027d5681656632631f8eac81575912b1b Author: Jan Rękorajski bagg...@pld-linux.org Date: Tue Jan 27 19:29:55 2015 +0100 - rel 2 ixgbe.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/ixgbe.spec b/ixgbe.spec index 1e1843f..ffab903 100644 --- a/ixgbe.spec +++ b/ixgbe.spec @@ -4,7 +4,7 @@ # nothing to be placed to debuginfo package %define_enable_debug_packages 0 -%definerel 1 +%definerel 2 %definepname ixgbe Summary: Intel(R) 10 Gigabit driver for Linux Summary(pl.UTF-8): Sterownik do karty Intel(R) 10 Gigabit gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ixgbe.git/commitdiff/4c38240027d5681656632631f8eac81575912b1b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ixgbe] - drop non-dist kernl support
commit a3e7a19d1090e87109405a4cd8ff3e7c8d8b3e29
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:28:28 2015 +0100
- drop non-dist kernl support
ixgbe.spec | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
---
diff --git a/ixgbe.spec b/ixgbe.spec
index 1e3283c..8c40d40 100644
--- a/ixgbe.spec
+++ b/ixgbe.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}
@@ -31,7 +30,7 @@ Group:Base/Kernel
Source0:
http://downloads.sourceforge.net/e1000/%{pname}-%{version}.tar.gz
# Source0-md5: bf70143cd1060698050745b212a1523e
URL: http://sourceforge.net/projects/e1000/
-%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build =
3:2.6.20.2}
+%{?with_kernel:BuildRequires: kernel%{_alt_kernel}-module-build = 3:2.6.20.2}
BuildRequires: rpmbuild(macros) = 1.678
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -50,10 +49,8 @@ Summary(pl.UTF-8): Sterownik do karty Intel(R) 10 Gigabit\
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-ixgbe\
This package contains the Linux driver for the Intel(R) 10 Gigabit\
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ixgbe.git/commitdiff/4c38240027d5681656632631f8eac81575912b1b
___
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] - rel 5
commit 764cd451f6c4a2b07789d30f33247523833cf476
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:41:57 2015 +0100
- rel 5
open-vm-tools.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index 1dc33c1..a57156f 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -22,7 +22,7 @@ exit 1
%definesubver %(echo %{snap} | tr -d .)
%definever 9.4.6
%definerev 1770165
-%definerel 4
+%definerel 5
%definepname open-vm-tools
%definemodsrc modules/linux
Summary: VMWare guest utilities
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/spl] - updated kernel modules build system
commit 35fe93cbc61f379f5dd138d99489d7d54d420ae6
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:46:51 2015 +0100
- updated kernel modules build system
spl.spec | 23 ---
1 file changed, 4 insertions(+), 19 deletions(-)
---
diff --git a/spl.spec b/spl.spec
index 47cff46..f8ad8c4 100644
--- a/spl.spec
+++ b/spl.spec
@@ -13,17 +13,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
@@ -31,10 +20,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 ; 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 spl
%definerel 4
Summary: Solaris Porting Layer
@@ -49,8 +34,8 @@ Source0:
http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/%{pname}-%{versi
Patch0:linux-3.17.patch
Patch1:linux-3.18.patch
URL: http://zfsonlinux.org/
-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}}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -134,7 +119,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}
@@ -146,7 +131,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/spl.git/commitdiff/c2a266890cfb585d34cad2ef765a6427b69c1351
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/spl] - rel 5
commit c2a266890cfb585d34cad2ef765a6427b69c1351
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:47:09 2015 +0100
- rel 5
spl.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/spl.spec b/spl.spec
index f8ad8c4..1519458 100644
--- a/spl.spec
+++ b/spl.spec
@@ -21,7 +21,7 @@ exit 1
%define_duplicate_files_terminate_build0
%definepname spl
-%definerel 4
+%definerel 5
Summary: Solaris Porting Layer
Summary(pl.UTF-8): Solaris Porting Layer - warstwa do portowania kodu z
Solarisa
Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/spl.git/commitdiff/c2a266890cfb585d34cad2ef765a6427b69c1351
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/lirc] - updated kernel modules build system
commit 08df13acf68810e20daeaf82e0b9751d2e368a3d
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 20:18:32 2015 +0100
- updated kernel modules build system
lirc.spec | 24
1 file changed, 4 insertions(+), 20 deletions(-)
---
diff --git a/lirc.spec b/lirc.spec
index e0d014c..d59a444 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -20,29 +20,13 @@
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 ; echo %%kernel_pkg_scriptlets ; 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 lirc
%definerel 104
-
#
# main package
#
@@ -92,8 +76,8 @@ BuildRequires:libftdi-devel = 0.12
BuildRequires: libirman-devel = 0.4.5
BuildRequires: libtool
BuildRequires: libusb-compat-devel = 0.1.0
-BuildRequires: rpmbuild(macros) = 1.679
-%{?with_kernel:%{expand:%kbrs}}
+BuildRequires: rpmbuild(macros) = 1.701
+%{?with_kernel:%{expand:%buildrequires_kernel
kernel%%{_alt_kernel}-module-build = 3:2.6.20.2}}
BuildRequires: rpm-pythonprov
%{?with_svga:BuildRequires:svgalib-devel}
%{?with_x:BuildRequires: xorg-lib-libX11-devel}
@@ -769,7 +753,7 @@ for drv in $drivers; do\
done\
%{nil}
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
%prep
%setup -q -n %{pname}-%{version} -a 1
@@ -810,7 +794,7 @@ echo '#' drivers/Makefile.am
%{__make} -j1
%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/lirc.git/commitdiff/d4938785355af677ba5292dbdea7e623d3438192
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/lirc] - rel 105
commit d4938785355af677ba5292dbdea7e623d3438192 Author: Jan Rękorajski bagg...@pld-linux.org Date: Tue Jan 27 20:18:52 2015 +0100 - rel 105 lirc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/lirc.spec b/lirc.spec index d59a444..a44dc8f 100644 --- a/lirc.spec +++ b/lirc.spec @@ -26,7 +26,7 @@ exit 1 %endif %definepname lirc -%definerel 104 +%definerel 105 # # main package # gitweb: http://git.pld-linux.org/gitweb.cgi/packages/lirc.git/commitdiff/d4938785355af677ba5292dbdea7e623d3438192 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/madwifi-ng] - drop non-dist kernel support
commit 6282284eb51613fd3fb73c77b92cd3cc9ae6b821
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 20:19:32 2015 +0100
- drop non-dist kernel support
madwifi-ng.spec | 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
---
diff --git a/madwifi-ng.spec b/madwifi-ng.spec
index 24a8b5b..761bb98 100644
--- a/madwifi-ng.spec
+++ b/madwifi-ng.spec
@@ -4,15 +4,10 @@
# - broken build without kernel
#
# 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 module
%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
@@ -78,7 +73,7 @@ Patch3: %{pname}-ieee80211-skb-update.patch
Patch4:format-security.patch
URL: http://madwifi-project.org/
BuildRequires: rpmbuild(macros) = 1.678
-%{?with_dist_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%kbrs}}
Provides: madwifi
Obsoletes: madwifi
ExclusiveArch: alpha arm %{ix86} %{x8664} mips powerpc ppc sparc sparcv9
sparc64 xscale
@@ -114,11 +109,9 @@ Summary(pl.UTF-8): Sterownik dla Linuksa do kart Atheros\
Release: %{prel}@%{_kernel_ver_str}\
Group: Base/Kernel\
Requires(post,postun): /sbin/depmod\
-%if %{with dist_kernel}\
%requires_releq_kernel\
Requires(postun): %releq_kernel\
Obsoletes: kernel-smp-net-madwifi-ng\
-%endif\
\
%description -n kernel%{_alt_kernel}-net-madwifi-ng\
This is driver for Atheros card for Linux.\
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/madwifi-ng.git/commitdiff/d6051d41a311127a29f765cc4a536564842e9305
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/babeltrace] - updated to 1.2.4
commit c7ef0e9abcc52ef784ff31a034c402aa27a649ad
Author: Jakub Bogusz qbo...@pld-linux.org
Date: Tue Jan 27 20:49:00 2015 +0100
- updated to 1.2.4
babeltrace.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/babeltrace.spec b/babeltrace.spec
index c0f8db2..fd2b521 100644
--- a/babeltrace.spec
+++ b/babeltrace.spec
@@ -5,12 +5,12 @@
Summary: Trace Format Babel Tower
Summary(pl.UTF-8): Wieża Babel formatów narzędzi śledzących
Name: babeltrace
-Version: 1.2.3
+Version: 1.2.4
Release: 1
License: MIT
Group: Applications/System
Source0: http://lttng.org/files/babeltrace/%{name}-%{version}.tar.bz2
-# Source0-md5: c35b480304ba34aacbfb3934182cdd21
+# Source0-md5: 20a806fa7570e69a91707855a98f3ca6
Patch0:%{name}-link.patch
URL: http://lttng.org/babeltrace
BuildRequires: autoconf = 2.50
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/babeltrace.git/commitdiff/c7ef0e9abcc52ef784ff31a034c402aa27a649ad
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: babeltrace: babeltrace-1.2.4.tar.bz2
Request by: qboosh Files fetched: 1 STORED: http://lttng.org/files/babeltrace/babeltrace-1.2.4.tar.bz2 20a806fa7570e69a91707855a98f3ca6 babeltrace-1.2.4.tar.bz2 Size: 995829 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/crash] - drop non-dist kernel support
commit e9928611b674fce5a4463fa3b29a5056cced7499
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:09:06 2015 +0100
- drop non-dist kernel support
crash.spec | 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
---
diff --git a/crash.spec b/crash.spec
index 9f3c686..efc0cc6 100644
--- a/crash.spec
+++ b/crash.spec
@@ -2,15 +2,10 @@
# - libeppic if anything else (but crash extension) wants to use it
#
# 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 kernel module 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 @@ Source1: eppic.tar.xz
# Source1-md5: a9f80ad71de9d6f5b77534a7ebdbed8e
URL: http://people.redhat.com/anderson/
BuildRequires: rpmbuild(macros) = 1.678
-%{?with_dist_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%kbrs}}
%if %{with userspace}
BuildRequires: ncurses-devel
BuildRequires: readline-devel
@@ -97,10 +92,8 @@ Summary(pl.UTF-8): Sterownik pamięci dla sesji crash na
żywym systemie\
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}-char-crash\
This package contains /dev/crash memory driver for live system crash\
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/e1000e] - no debuginfo here
commit a01ffceccbf6afd3f9807d747ff48da0d9190912 Author: Jan Rękorajski bagg...@pld-linux.org Date: Tue Jan 27 19:25:14 2015 +0100 - no debuginfo here e1000e.spec | 3 +++ 1 file changed, 3 insertions(+) --- diff --git a/e1000e.spec b/e1000e.spec index ece6566..4fe0e6a 100644 --- a/e1000e.spec +++ b/e1000e.spec @@ -2,6 +2,9 @@ # Conditional build: %bcond_withverbose # verbose build (V=1) +# nothing to be placed to debuginfo package +%define_enable_debug_packages 0 + %definerel 3 %definepname e1000e Summary: Intel(R) PRO/1000e driver for Linux gitweb: http://git.pld-linux.org/gitweb.cgi/packages/e1000e.git/commitdiff/a01ffceccbf6afd3f9807d747ff48da0d9190912 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/igb] - updated kernel modules build system
commit 527dfcfef11b46f8c11970ba687a227144dcbafd
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:24:04 2015 +0100
- updated kernel modules build system
igb.spec | 24 +---
1 file changed, 5 insertions(+), 19 deletions(-)
---
diff --git a/igb.spec b/igb.spec
index b2f96ee..3e612b6 100644
--- a/igb.spec
+++ b/igb.spec
@@ -1,20 +1,6 @@
# 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
-
-%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)
-%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)
-
# nothing to be placed to debuginfo package
%define_enable_debug_packages 0
@@ -32,8 +18,8 @@ Group:Base/Kernel
Source0:
http://downloads.sourceforge.net/e1000/%{pname}-%{version}.tar.gz
# Source0-md5: b59b8d5ae7d8f53f3481004051fb7b87
URL: http://sourceforge.net/projects/e1000/
-%{?with_kernel:BuildRequires: kernel%{_alt_kernel}-module-build = 3:2.6.20.2}
-BuildRequires: rpm-build-macros = 1.678
+%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build =
3:2.6.20.2}
+BuildRequires: rpm-build-macros = 1.701
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -90,7 +76,7 @@ alias igb igb-current\
EOF\
%{nil}
-%{expand:%kpkg}
+%{expand:%create_kernel_packages}
%prep
%setup -q -n %{pname}-%{version}
@@ -108,13 +94,13 @@ EXTRA_CFLAGS += -DDRIVER_NAME_CAPS=IGB
EOF
%build
-%{expand:%bkpkg}
+%{expand:%build_kernel_packages}
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_mandir}/man7
-%{expand:%ikpkg}
+%{expand:%install_kernel_packages}
cp -a installed/* $RPM_BUILD_ROOT
cp -a igb.7 $RPM_BUILD_ROOT%{_mandir}/man7
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/igb.git/commitdiff/a5730afb564aafe018c035deca17bf1cca41fb3d
___
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] - drop non-dist kernel support
commit 15c9437a8a344d3cd0696ea7bfa56a5ac6bed178
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:32:45 2015 +0100
- drop non-dist kernel support
linux-fusion.spec | 11 +--
1 file changed, 1 insertion(+), 10 deletions(-)
---
diff --git a/linux-fusion.spec b/linux-fusion.spec
index c69f00c..fbed2f7 100644
--- a/linux-fusion.spec
+++ b/linux-fusion.spec
@@ -1,14 +1,9 @@
#
# 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
@@ -50,7 +45,7 @@ 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_dist_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%kbrs}}
BuildRequires: rpmbuild(macros) = 1.678
BuildRequires: sed = 4.0
BuildRequires: tar = 1:1.22
@@ -98,10 +93,8 @@ Summary(pl.UTF-8): Moduł Fusion dla 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}-char-fusion\
Fusion module for Linux kernel.\
@@ -127,10 +120,8 @@ Summary(pl.UTF-8): Moduł IPC One dla 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}-misc-one\
One IPC module for Linux kernel.\
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/linux-fusion] - rel 2
commit bddc560999d18a1038b78d9799a0fb1c0fd6377b Author: Jan Rękorajski bagg...@pld-linux.org Date: Tue Jan 27 19:34:10 2015 +0100 - rel 2 linux-fusion.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/linux-fusion.spec b/linux-fusion.spec index ca944e4..5a1a31d 100644 --- a/linux-fusion.spec +++ b/linux-fusion.spec @@ -18,7 +18,7 @@ exit 1 %define_enable_debug_packages 0 %endif -%definerel 1 +%definerel 2 %definepname linux-fusion Summary: Fusion and One Linux kernel modules Summary(pl.UTF-8): Moduły Fusion i One dla jądra Linuksa 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] - uppdated kernel modules build system
commit 0e96efb5df0759fed180c7dc883568d5c21ec856
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 19:44:53 2015 +0100
- uppdated kernel modules build system
rtl8812au.spec | 22 --
1 file changed, 4 insertions(+), 18 deletions(-)
---
diff --git a/rtl8812au.spec b/rtl8812au.spec
index d247d81..8d0d7f8 100644
--- a/rtl8812au.spec
+++ b/rtl8812au.spec
@@ -1,23 +1,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 5
%definesnap20140901
%definepname rtl8812au
@@ -40,8 +26,8 @@ Patch3: update-cfg80211-support.patch
Patch4:warnings.patch
Patch5:gcc-4.9.patch
Patch6:linux-3.18.patch
-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}/%{pname}-%{version}-root-%(id -u -n)
%description
@@ -76,7 +62,7 @@ Driver for AC1200 (802.11ac) Wireless Dual-Band USB Adapter\
%install_kernel_modules -D installed -m 8812au -d kernel/drivers/net/wireless\
%{nil}
-%{expand:%kpkg}
+%{expand:%create_kernel_packages}
%prep
#%setup -q -n %{pname}-%{version}
@@ -90,7 +76,7 @@ Driver for AC1200 (802.11ac) Wireless Dual-Band USB Adapter\
%patch6 -p1
%build
-%{expand:%bkpkg}
+%{expand:%build_kernel_packages}
%install
rm -rf $RPM_BUILD_ROOT
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/xorg-driver-video-nvidia-legacy-304xx] - drop non-dist kernel support
commit e6ee6dfcd3afc59b0e1847e55ecf363be1eafa69
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Tue Jan 27 20:08:13 2015 +0100
- drop non-dist kernel support
xorg-driver-video-nvidia-legacy-304xx.spec | 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
---
diff --git a/xorg-driver-video-nvidia-legacy-304xx.spec
b/xorg-driver-video-nvidia-legacy-304xx.spec
index 3a15a25..562f36d 100644
--- a/xorg-driver-video-nvidia-legacy-304xx.spec
+++ b/xorg-driver-video-nvidia-legacy-304xx.spec
@@ -4,16 +4,11 @@
# - kernel-drm is required on newer kernels. driver for kernel-longterm not
requires drm
#
# Conditional build:
-%bcond_without dist_kernel # without distribution kernel
%bcond_without kernel # without kernel packages
%bcond_without userspace # don't build userspace programs
%bcond_withsettings# package nvidia-settings here (GPL version of
same packaged from nvidia-settings.spec)
%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
@@ -70,7 +65,7 @@ Patch0: X11-driver-nvidia-GL.patch
Patch1:X11-driver-nvidia-desktop.patch
URL: http://www.nvidia.com/object/unix.html
BuildRequires: rpmbuild(macros) = 1.678
-%{?with_dist_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%kbrs}}
BuildRequires: sed = 4.0
BuildConflicts:XFree86-nvidia
Requires: %{pname}-libs = %{epoch}:%{version}-%{rel}
@@ -203,13 +198,11 @@ Release: %{rel}@%{_kernel_ver_str}\
Group: Base/Kernel\
Requires(post,postun): /sbin/depmod\
Requires: dev = 2.7.7-10\
-%if %{with dist_kernel}\
%requires_releq_kernel\
%if %{_kernel_version_code} = %{_kernel_version_magic 3 10 0}\
Requires: %{releq_kernel -n drm}\
%endif\
Requires(postun): %releq_kernel\
-%endif\
Requires: %{pname} = %{epoch}:%{version}\
Provides: X11-driver-nvidia(kernel)\
Obsoletes: XFree86-nvidia-kernel\
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-nvidia-legacy-304xx.git/commitdiff/9382bcc1b689b785523a82150a42ec2fcca49151
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/totem] Require clutter-gst2
commit 4e655280c843a204ec55206efadb262d78061ff2
Author: Marcin Banasiak marcin.banas...@gmail.com
Date: Tue Jan 27 20:40:49 2015 +0100
Require clutter-gst2
totem.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/totem.spec b/totem.spec
index 03e32a6..f4c57ed 100644
--- a/totem.spec
+++ b/totem.spec
@@ -19,7 +19,7 @@ URL: https://wiki.gnome.org/Apps/Videos
BuildRequires: autoconf = 2.64
BuildRequires: automake = 1:1.11
BuildRequires: clutter-devel = 1.18.0
-BuildRequires: clutter-gst-devel = 1.9.0
+BuildRequires: clutter-gst2-devel = 1.9.0
BuildRequires: clutter-gtk-devel = 1.5.5
BuildRequires: docbook-dtd45-xml
BuildRequires: gdk-pixbuf2-devel = 2.24.0
@@ -66,7 +66,7 @@ Requires(post,postun):gtk-update-icon-cache
Requires(post,postun): glib2 = 1:2.28.0
Requires(post,postun): scrollkeeper
Requires: %{name}-libs = %{version}-%{release}
-Requires: clutter-gst = 2.0.0-2
+Requires: clutter-gst2 = 2.0.0-2
Requires: glib2 = 1:2.36.0
Requires: gnome-icon-theme = 3.0.0
Requires: gstreamer-audiosink = 1.4.2
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/totem.git/commitdiff/4e655280c843a204ec55206efadb262d78061ff2
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/intellij-idea] up to 14.0.2 (build 139.659.2)
commit 6a3fbc6158ece4048ad4418ee06e67164aeb0e3d
Author: Elan Ruusamäe g...@delfi.ee
Date: Tue Jan 27 11:29:50 2015 +0200
up to 14.0.2 (build 139.659.2)
intellij-idea.spec | 34 +++---
1 file changed, 19 insertions(+), 15 deletions(-)
---
diff --git a/intellij-idea.spec b/intellij-idea.spec
index 26c8f8d..e4b87d9 100644
--- a/intellij-idea.spec
+++ b/intellij-idea.spec
@@ -1,12 +1,15 @@
+%defineproduct idea
+%defineproddir %{product}IC
+%definebuildid 139.659.2
%include /usr/lib/rpm/macros.java
-Summary: IntelliJ IDEA 12 - The Most Intelligent Java IDE
+Summary: IntelliJ IDEA 14 - The Most Intelligent Java IDE
Name: intellij-idea
-Version: 12.1.2
-Release: 0.2
+Version: 14.0.2
+Release: 0.1
License: Apache v2.0
Group: Development/Tools
Source0: http://download.jetbrains.com/idea/ideaIC-%{version}-src.tar.bz2
-# Source0-md5: 68cf6340a3ce985cab659944e3ddf926
+# Source0-md5: 17889882abc3f99c15f231d192e93b33
Source1: %{name}.desktop
Source2: jdk.table.xml
Patch0:jdk.table.patch
@@ -38,8 +41,8 @@ codebase, makes great suggestions right when you need them,
and is
always ready to help you shape your code.
%prep
-%setup -qn ideaIC-129.354
-%undos bin/scripts/unix/idea.sh
+%setup -qn %{proddir}-%{buildid}
+%undos bin/scripts/unix/%{product}.sh
%patch0 -p1
%build
@@ -51,12 +54,12 @@ cd out/dist.unix.ce
%ifarch %{ix86}
rm bin/fsnotifier64
rm bin/libbreakgen64.so
-rm bin/idea64.vmoptions
+rm bin/%{product}64.vmoptions
%endif
%ifarch %{x8664}
rm bin/fsnotifier
rm bin/libbreakgen.so
-rm bin/idea.vmoptions
+rm bin/%{product}.vmoptions
%endif
chmod a+rx bin/*.so bin/fsnotifier*
cd ../..
@@ -69,12 +72,13 @@ cd out
cp -l dist.all.ce/build.txt $RPM_BUILD_ROOT/cp-test l=l rm -f
$RPM_BUILD_ROOT/cp-test
cp -a$l dist.all.ce/{bin,lib,license,plugins} $RPM_BUILD_ROOT%{_appdir}
-cp -p dist.unix.ce/bin/idea.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+cp -p dist.unix.ce/bin/%{product}.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
cp -a$l dist.unix.ce/bin $RPM_BUILD_ROOT%{_appdir}
+%{__rm} $RPM_BUILD_ROOT%{_appdir}/bin/%{product}.png
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
%{__sed} -e 's,@jvmdir@,%{_jvmdir},g' %{SOURCE2}
$RPM_BUILD_ROOT%{_appdir}/jdk.table.xml
-ln -s %{_appdir}/bin/idea.sh $RPM_BUILD_ROOT%{_bindir}/idea
+ln -s %{_appdir}/bin/%{product}.sh $RPM_BUILD_ROOT%{_bindir}/%{product}
desktop-file-validate $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
@@ -86,19 +90,19 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc LICENSE.txt README.md
-%attr(755,root,root) %{_bindir}/idea
+%doc NOTICE.txt
+%attr(755,root,root) %{_bindir}/%{product}
%dir %{_appdir}
%{_appdir}/lib
%{_appdir}/license
%{_appdir}/plugins
%{_appdir}/jdk.table.xml
%dir %{_appdir}/bin
-%{_appdir}/bin/idea*.vmoptions
+%{_appdir}/bin/%{product}*.vmoptions
+%{_appdir}/bin/%{product}.properties
%{_appdir}/bin/appletviewer.policy
-%{_appdir}/bin/idea.properties
%{_appdir}/bin/log.xml
-%attr(755,root,root) %{_appdir}/bin/idea.sh
+%attr(755,root,root) %{_appdir}/bin/%{product}.sh
%attr(755,root,root) %{_appdir}/bin/inspect.sh
%attr(755,root,root) %{_appdir}/bin/fsnotifier*
%attr(755,root,root) %{_appdir}/bin/libbreakgen*.so
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/intellij-idea.git/commitdiff/6a3fbc6158ece4048ad4418ee06e67164aeb0e3d
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: GeoIP-db-IPASNum: GeoIPASNum.dat.gz
Request by: glen Files fetched: 1 STORED: http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz 10687005b3d06cdc2077ac0719e56a70 GeoIPASNum.dat.gz Size: 2080524 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/GeoIP-db-IPASNum] up to 2015.01.26
commit 6c3411cb44cc1ed53daec2f0754053457bae7ae2 Author: Elan Ruusamäe g...@delfi.ee Date: Tue Jan 27 11:34:41 2015 +0200 up to 2015.01.26 GeoIP-db-IPASNum.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/GeoIP-db-IPASNum.spec b/GeoIP-db-IPASNum.spec index ea12e80..498280f 100644 --- a/GeoIP-db-IPASNum.spec +++ b/GeoIP-db-IPASNum.spec @@ -2,12 +2,12 @@ Summary: GeoLite IPASNum - IP to AS number translation database for GeoIP Summary(pl.UTF-8): GeoLite IPASNum - baza danych tłumaczeń adresów IP na numery AS dla GeoIP Name: GeoIP-db-IPASNum # Updated every month: -Version: 2015.01.21 +Version: 2015.01.26 Release: 1 License: CC 3.0 BY-SA Group: Applications/Databases Source0: http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz -# Source0-md5: 2eb612fde45b40c2fb3f358dfc52d8db +# Source0-md5: 10687005b3d06cdc2077ac0719e56a70 URL: http://dev.maxmind.com/geoip/legacy/geolite/ Requires: GeoIP-libs BuildArch: noarch gitweb: http://git.pld-linux.org/gitweb.cgi/packages/GeoIP-db-IPASNum.git/commitdiff/6c3411cb44cc1ed53daec2f0754053457bae7ae2 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: intellij-idea: ideaIC-14.0.2-src.tar.bz2
Request by: glen Files fetched: 1 STORED: http://download.jetbrains.com/idea/ideaIC-14.0.2-src.tar.bz2 17889882abc3f99c15f231d192e93b33 ideaIC-14.0.2-src.tar.bz2 Size: 326899662 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/rpm-build-macros] kernel modules: fix syntax error; rel 2
commit 0109ecc6e5ac4d194f444a6ad71eccf5e5bbd4f6
Author: Elan Ruusamäe g...@delfi.ee
Date: Tue Jan 27 11:07:51 2015 +0200
kernel modules: fix syntax error; rel 2
rpm-build-macros.spec | 2 +-
rpm.macros.kernel | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index add7907..d5871c6 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -4,7 +4,7 @@ Summary:PLD Linux RPM build macros
Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD
Name: rpm-build-macros
Version: %{rpm_macros_rev}
-Release: 1
+Release: 2
License: GPL
Group: Development/Building
Source0: rpm.macros
diff --git a/rpm.macros.kernel b/rpm.macros.kernel
index 57aac80..0a3d27b 100644
--- a/rpm.macros.kernel
+++ b/rpm.macros.kernel
@@ -113,7 +113,7 @@ done)
%{!?debug:set +x;} \
if [ -d $RPM_BUILD_ROOT/lib/modules ]; then \
tool=$(%{kmod_compress_cmd} --version | head -n1); \
- ext=$(case $tool in gzip*) ext=gz;; xz*) ext=xz;; esac; \
+ case $tool in gzip*) ext=gz;; xz*) ext=xz;; esac; \
q=$(find $RPM_BUILD_ROOT/lib/modules -name '*o' -type f
-print); \
if [ $q ]; then \
printf Compress %d kernel modules... $(echo $q | wc
-l); \
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/0109ecc6e5ac4d194f444a6ad71eccf5e5bbd4f6
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/glibc/AC-branch] accept newer binutils
commit e082b3a00198eef135210b3a63997c03e7689628
Author: Elan Ruusamäe g...@delfi.ee
Date: Tue Jan 27 22:58:49 2015 +0200
accept newer binutils
binutils-2.20.patch | 15 +++
glibc.spec | 2 ++
2 files changed, 17 insertions(+)
---
diff --git a/glibc.spec b/glibc.spec
index 30526a2..b6c4c2b 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -151,6 +151,7 @@ Patch42:%{name}-rh228103.patch
Patch43: %{name}-rh219145.patch
Patch44: %{name}-posix-sh.patch
Patch45: %{name}-bug-2644.patch
+Patch46: binutils-2.20.patch
URL: http://www.gnu.org/software/libc/
%{?with_selinux:BuildRequires: audit-libs-devel}
BuildRequires: autoconf
@@ -1010,6 +1011,7 @@ Biblioteki 64-bitowe GNU libc dla architektury 64bit.
%patch43 -p1
%patch44 -p1
%patch45 -p0
+%patch46 -p1
chmod +x scripts/cpp
diff --git a/binutils-2.20.patch b/binutils-2.20.patch
new file mode 100644
index 000..12370fe
--- /dev/null
+++ b/binutils-2.20.patch
@@ -0,0 +1,15 @@
+--- glibc-2.3.6/configure.in~ 2005-07-18 04:38:55.0 +0300
glibc-2.3.6/configure.in 2015-01-27 22:42:00.707580267 +0200
+@@ -734,10 +734,10 @@
+ # Accept binutils 2.13 or newer.
+ AC_CHECK_PROG_VER(AS, $AS, --version,
+ [GNU assembler.* \([0-9]*\.[0-9.]*\)],
+-[2.1[3-9]*], AS=: critic_missing=$critic_missing as)
++[2.1[3-9]*|2.[2-9]*], AS=: critic_missing=$critic_missing
as)
+ AC_CHECK_PROG_VER(LD, $LD, --version,
+ [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)],
+-[2.1[3-9]*], LD=: critic_missing=$critic_missing ld)
++[2.1[3-9]*|2.[2-9]*], LD=: critic_missing=$critic_missing
ld)
+
+ # We need the physical current working directory. We cannot use the
+ # pwd -P shell builtin since that's not portable. Instead we try to
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/glibc.git/commitdiff/e082b3a00198eef135210b3a63997c03e7689628
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/pipelight] Version: 0.2.8
commit 6ec22fd5fef99afcfa01903c6dadc7177a906385
Author: Jacek Konieczny jaj...@jajcus.net
Date: Tue Jan 27 22:18:23 2015 +0100
Version: 0.2.8
pipelight-lib64.patch | 48
pipelight-pld.patch | 61 ++-
pipelight.spec| 27 ++-
3 files changed, 53 insertions(+), 83 deletions(-)
---
diff --git a/pipelight.spec b/pipelight.spec
index e69cb0f..0e4e60a 100644
--- a/pipelight.spec
+++ b/pipelight.spec
@@ -1,19 +1,20 @@
-%define commit 487f8db5a03d
+%define commit b7b5e5471d52
Summary: Browser plugin to load Windows browser plugins
Summary(pl.UTF-8): Wtyczka przeglądarki do wczytywania wtyczek
przeglądarek z systemu Windows
Name: pipelight
-Version: 0.2.6
+Version: 0.2.8
Release: 0.1
License: MPL v1.1 or GPL v2+ or LGPL v2.1+
Group: Applications/WWW
Source0:
https://bitbucket.org/mmueller2012/pipelight/get/v%{version}.tar.bz2
-# Source0-md5: 265747e08a3b2dd806c47a228f03df5b
+# Source0-md5: 9fcbc7019a49eb0c2f613eaba0e96df6
Source1:
http://repos.fds-team.de/pluginloader/v%{version}/pluginloader.tar.gz
-# Source1-md5: 5931da0500aed46f875b28cec2160cfe
-Patch0:%{name}-lib64.patch
-Patch1:%{name}-pld.patch
+# Source1-md5: 71b595924b8c8d91c830c2a897362ad2
+Source2:
http://repos.fds-team.de/pluginloader/v%{version}/pluginloader.tar.gz.sig
+# Source2-md5: e0b2467752881ac2735594d4ba8fe179
+Patch0:%{name}-pld.patch
URL: https://launchpad.net/pipelight
BuildRequires: libstdc++-devel
BuildRequires: xorg-lib-libX11-devel
@@ -38,10 +39,11 @@ Silverlighta niezbędna jest załatana wersja Wine.
%prep
%setup -q -a1 -n mmueller2012-%{name}-%{commit}
-%if %{_lib} == lib64
%patch0 -p1
-%endif
-%patch1 -p1
+exit 1
+
+ln -s %{SOURCE1} pluginloader-v%{version}.tar.gz
+ln -s %{SOURCE2} pluginloader-v%{version}.tar.gz.sig
%build
# not autoconf-generated
@@ -49,7 +51,9 @@ Silverlighta niezbędna jest załatana wersja Wine.
--prefix=%{_prefix} \
--wine-path=%{_bindir}/wine \
--moz-plugin-path=%{_browserpluginsdir} \
+ --libdir=%{_libdir} \
--win32-prebuilt \
+ --downloader=/bin/false \
%ifarch %{x8664}
--with-win64 \
%endif
@@ -73,11 +77,14 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/%{name}/libpipelight.so
%{_mandir}/man1/pipelight-plugin.1*
%dir %{_datadir}/%{name}
-%attr(755,root,root) %{_datadir}/%{name}/hw-accel-default
%attr(755,root,root) %{_datadir}/%{name}/install-dependency
%attr(755,root,root) %{_datadir}/%{name}/pluginloader.exe
+%attr(755,root,root) %{_datadir}/%{name}/wine
+%attr(755,root,root) %{_datadir}/%{name}/winecheck.exe
%ifarch %{x8664}
%attr(755,root,root) %{_datadir}/%{name}/pluginloader64.exe
+%attr(755,root,root) %{_datadir}/%{name}/wine64
+%attr(755,root,root) %{_datadir}/%{name}/winecheck64.exe
%endif
%{_datadir}/%{name}/sig-install-dependency.gpg
%{_datadir}/%{name}/configs
diff --git a/pipelight-lib64.patch b/pipelight-lib64.patch
deleted file mode 100644
index bb5ecfd..000
--- a/pipelight-lib64.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -dur mmueller2012-pipelight-487f8db5a03d.orig/Makefile
mmueller2012-pipelight-487f8db5a03d/Makefile
mmueller2012-pipelight-487f8db5a03d.orig/Makefile 2014-04-06
04:43:13.0 +0200
-+++ mmueller2012-pipelight-487f8db5a03d/Makefile 2014-05-03
17:11:42.350768574 +0200
-@@ -51,7 +51,7 @@
- mkdir -p $(DESTDIR)$(prefix)/share/pipelight/configs
- mkdir -p $(DESTDIR)$(prefix)/share/pipelight/licenses
- mkdir -p $(DESTDIR)$(prefix)/share/pipelight/scripts
-- mkdir -p $(DESTDIR)$(prefix)/lib/pipelight
-+ mkdir -p $(DESTDIR)$(prefix)/lib64/pipelight
- mkdir -p $(DESTDIR)$(prefix)/bin
- mkdir -p $(DESTDIR)$(prefix)/share/man/man1
-
-@@ -88,10 +88,10 @@
- rm pipelight-license.tmp; \
- done
-
-- install -m 0644 src/linux/libpipelight.so
$(DESTDIR)$(prefix)/lib/pipelight/libpipelight.so
-+ install -m 0644 src/linux/libpipelight.so
$(DESTDIR)$(prefix)/lib64/pipelight/libpipelight.so
-
- sed 's|@@VERSION@@|$(version)|g' bin/pipelight-plugin
pipelight-plugin.tmp
-- sed -i'' -e 's|@@LIBRARY_PATH@@|$(prefix)/lib/pipelight/|g'
pipelight-plugin.tmp
-+ sed -i'' -e 's|@@LIBRARY_PATH@@|$(prefix)/lib64/pipelight/|g'
pipelight-plugin.tmp
- sed -i'' -e 's|@@CONFIG_PATH@@|$(prefix)/share/pipelight/configs|g'
pipelight-plugin.tmp
- sed -i'' -e 's|@@LICENSE_PATH@@|$(prefix)/share/pipelight/licenses|g'
pipelight-plugin.tmp
- sed -i'' -e
's|@@DEPENDENCY_INSTALLER@@|$(prefix)/share/pipelight/install-dependency|g'
pipelight-plugin.tmp
-@@ -116,7 +116,7 @@
- rm -f $(DESTDIR)$(prefix)/share/pipelight/scripts/configure-*
- rm -f $(DESTDIR)$(prefix)/share/pipelight/configs/pipelight-*
- rm -f
[packages/gtkhtml3] - renamed to gtkhtml3
commit 2d20286e1b89ba66440623c00b265917d26c2fe3
Author: Jakub Bogusz qbo...@pld-linux.org
Date: Tue Jan 27 21:30:57 2015 +0100
- renamed to gtkhtml3
gtkhtml.spec = gtkhtml3.spec | 81 ++-
1 file changed, 42 insertions(+), 39 deletions(-)
---
diff --git a/gtkhtml.spec b/gtkhtml3.spec
similarity index 66%
rename from gtkhtml.spec
rename to gtkhtml3.spec
index 0473b34..6ca6a07 100644
--- a/gtkhtml.spec
+++ b/gtkhtml3.spec
@@ -1,15 +1,15 @@
-Summary: GtkHTML library
-Summary(pl.UTF-8): Biblioteka GtkHTML
-Summary(pt_BR.UTF-8): Biblioteca GtkHTML
-Summary(ru.UTF-8): GtkHTML - это библиотека рендеринга/редактирования HTML
-Summary(uk.UTF-8): GtkHTML - це бібліотека рендерингу/редагування HTML
-Summary(zh_CN.UTF-8): GtkHTML 库
-Name: gtkhtml
+Summary: GtkHTML 3 library
+Summary(pl.UTF-8): Biblioteka GtkHTML 3
+Summary(pt_BR.UTF-8): Biblioteca GtkHTML 3
+Summary(ru.UTF-8): GtkHTML 3 - это библиотека рендеринга/редактирования
HTML
+Summary(uk.UTF-8): GtkHTML 3 - це бібліотека рендерингу/редагування HTML
+Summary(zh_CN.UTF-8): GtkHTML 3 库
+Name: gtkhtml3
Version: 3.32.2
Release: 1
License: LGPL v2+
Group: X11/Libraries
-Source0:
http://ftp.gnome.org/pub/GNOME/sources/gtkhtml/3.32/%{name}-%{version}.tar.bz2
+Source0:
http://ftp.gnome.org/pub/GNOME/sources/gtkhtml/3.32/gtkhtml-%{version}.tar.bz2
# Source0-md5: 3e1a1d56beef147aa0a95e5ebbf61c8c
BuildRequires: GConf2-devel = 2.24.0
BuildRequires: autoconf = 2.58
@@ -28,43 +28,44 @@ Requires: enchant = 1.1.7
Requires: gnome-icon-theme = 2.22.0
Requires: gtk+2 = 2:2.20.0
Obsoletes: gal
+Obsoletes: gtkhtml 3.90
Obsoletes: libgtkhtml20
# sr@Latn vs. sr@latin
Conflicts: glibc-misc 6:2.7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
-This is GtkHTML, a lightweight HTML rendering/printing/editing engine.
-It was originally based on KHTMLW, but is now being developed
+This is GtkHTML 3, a lightweight HTML rendering/printing/editing
+engine. It was originally based on KHTMLW, but is now being developed
independently of it.
%description -l pl.UTF-8
-GtkHTML jest lekką biblioteką do renderingu, drukowania i edycji
+GtkHTML 3 jest lekką biblioteką do renderingu, drukowania i edycji
HTML. Pierwotne źródła tej biblioteki bazują na KHTMLW ale teraz
GtkHTML jest rozwijana niezależnie od KHTMLW.
%description -l pt_BR.UTF-8
-Este é o GtkHTML, uma ferramenta de renderizar/imprimir/editar HTML
+Este é o GtkHTML 3, uma ferramenta de renderizar/imprimir/editar HTML
leve e pequeno
%description -l ru.UTF-8
-Это GtkHTML, легкий движок рендеринга/печати/редактирования HTML.
+Это GtkHTML 3, легкий движок рендеринга/печати/редактирования HTML.
Сначала он базировался на KHTMLW, но теперь разрабатывается
независимо.
%description -l uk.UTF-8
-Це GtkHTML, легке ядро рендерингу/друку/редагування HTML. Воно
+Це GtkHTML 3, легке ядро рендерингу/друку/редагування HTML. Воно
спочатку базувалось на KHTMLW, але тепер розробляється незалежно від
нього.
%package devel
-Summary: Header files etc. neccessary to develop GtkHTML applications
-Summary(es.UTF-8): Bibliotecas, archivos de inclusión, e etc. para
desarrollar aplicaciones GtkHTML
-Summary(pl.UTF-8): Pliki nagłówkowe i inne niezbędne do tworzenia
aplikacji używających GtkHTML
-Summary(pt_BR.UTF-8): Bibliotecas, arquivos de inclusão, e etc para
desenvolver aplicações GtkHTML
-Summary(ru.UTF-8): Файлы, необходимые для разработки программ с
использованием GtkHTML
-Summary(uk.UTF-8): Файли, необхідні для розробки програм з використанням
GtkHTML
-Summary(zh_CN.UTF-8): GtkHTML开发库
+Summary: Header files etc. neccessary to develop GtkHTML 3 applications
+Summary(es.UTF-8): Bibliotecas, archivos de inclusión, e etc. para
desarrollar aplicaciones GtkHTML 3
+Summary(pl.UTF-8): Pliki nagłówkowe i inne niezbędne do tworzenia
aplikacji używających GtkHTML 3
+Summary(pt_BR.UTF-8): Bibliotecas, arquivos de inclusão, e etc para
desenvolver aplicações GtkHTML 3
+Summary(ru.UTF-8): Файлы, необходимые для разработки программ с
использованием GtkHTML 3
+Summary(uk.UTF-8): Файли, необхідні для розробки програм з використанням
GtkHTML 3
+Summary(zh_CN.UTF-8): GtkHTML 3 开发库
Group: X11/Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: GConf2-devel = 2.24.0
@@ -72,54 +73,56 @@ Requires: enchant-devel = 1.1.7
Requires: gtk+2-devel = 2:2.20.0
Requires: iso-codes = 0.49
Obsoletes: gal-devel
+Obsoletes: gtkhtml-devel 3.90
Obsoletes: libgtkhtml20-devel
%description devel
-Header files etc. neccessary to develop GtkHTML applications.
+Header files etc. neccessary to develop GtkHTML 3 applications.
%description devel -l es.UTF-8
Bibliotecas, archivos de inclusión, y etc para desarrollar
-aplicaciones GtkHTML.
[packages/glibc/CVE-2015-0235] fix for CVE-2015-0235 aka GHOST: glibc gethostbyname, buffer overflow
commit 90da310628db619a437f83bd8e28ded29555e033
Author: Elan Ruusamäe g...@delfi.ee
Date: Tue Jan 27 22:59:26 2015 +0200
fix for CVE-2015-0235 aka GHOST: glibc gethostbyname, buffer overflow
CVE-2015-0235.patch | 231
glibc.spec | 4 +-
2 files changed, 234 insertions(+), 1 deletion(-)
---
diff --git a/glibc.spec b/glibc.spec
index b6c4c2b..562cba2 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -86,7 +86,7 @@ Summary(tr.UTF-8):GNU libc
Summary(uk.UTF-8): GNU libc версії 2.3
Name: glibc
Version: 2.3.6
-Release: 20
+Release: 21
Epoch: 6
License: LGPL
Group: Libraries
@@ -152,6 +152,7 @@ Patch43:%{name}-rh219145.patch
Patch44: %{name}-posix-sh.patch
Patch45: %{name}-bug-2644.patch
Patch46: binutils-2.20.patch
+Patch47: CVE-2015-0235.patch
URL: http://www.gnu.org/software/libc/
%{?with_selinux:BuildRequires: audit-libs-devel}
BuildRequires: autoconf
@@ -1012,6 +1013,7 @@ Biblioteki 64-bitowe GNU libc dla architektury 64bit.
%patch44 -p1
%patch45 -p0
%patch46 -p1
+%patch47 -p1
chmod +x scripts/cpp
diff --git a/CVE-2015-0235.patch b/CVE-2015-0235.patch
new file mode 100644
index 000..e095c1c
--- /dev/null
+++ b/CVE-2015-0235.patch
@@ -0,0 +1,231 @@
+Upstream:
+https://sourceware.org/git/?p=glibc.git;a=commit;h=d5dd6189d506068ed11c8bfa1e1e9bffde04decd
+
+Upstream Bug:
+https://sourceware.org/bugzilla/show_bug.cgi?id=15014
+
+Redhat:
+https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2015-0235
+also known glibc-rh1183535.patch
+
+commit d5dd6189d506068ed11c8bfa1e1e9bffde04decd
+Author: Andreas Schwab sch...@suse.de
+Date: Mon Jan 21 17:41:28 2013 +0100
+
+Fix parsing of numeric hosts in gethostbyname_r
+
+--- glibc-2.3.6/nss/Makefile~ 2002-09-29 21:17:29.0 +0300
glibc-2.3.6/nss/Makefile 2015-01-27 22:47:01.136475816 +0200
+@@ -39,7 +39,7 @@
+ others := getent
+ install-bin := getent
+
+-tests = test-netdb
++tests = test-netdb test-digits-dots
+ xtests= bug-erange
+
+ include ../Makeconfig
+diff --git a/nss/digits_dots.c b/nss/digits_dots.c
+index 2b86295..e007ef4 100644
+--- a/nss/digits_dots.c
b/nss/digits_dots.c
+@@ -46,7 +46,10 @@ __nss_hostname_digits_dots (const char *name, struct
hostent *resbuf,
+ {
+ if (h_errnop)
+ *h_errnop = NETDB_INTERNAL;
+- *result = NULL;
++ if (buffer_size == NULL)
++ *status = NSS_STATUS_TRYAGAIN;
++ else
++ *result = NULL;
+ return -1;
+ }
+
+@@ -83,14 +86,16 @@ __nss_hostname_digits_dots (const char *name, struct
hostent *resbuf,
+ }
+
+ size_needed = (sizeof (*host_addr)
+- + sizeof (*h_addr_ptrs) + strlen (name) + 1);
++ + sizeof (*h_addr_ptrs)
++ + sizeof (*h_alias_ptr) + strlen (name) + 1);
+
+ if (buffer_size == NULL)
+ {
+ if (buflen size_needed)
+ {
++*status = NSS_STATUS_TRYAGAIN;
+ if (h_errnop != NULL)
+- *h_errnop = TRY_AGAIN;
++ *h_errnop = NETDB_INTERNAL;
+ __set_errno (ERANGE);
+ goto done;
+ }
+@@ -109,7 +114,7 @@ __nss_hostname_digits_dots (const char *name, struct
hostent *resbuf,
+ *buffer_size = 0;
+ __set_errno (save);
+ if (h_errnop != NULL)
+- *h_errnop = TRY_AGAIN;
++ *h_errnop = NETDB_INTERNAL;
+ *result = NULL;
+ goto done;
+ }
+@@ -149,7 +154,9 @@ __nss_hostname_digits_dots (const char *name, struct
hostent *resbuf,
+ if (! ok)
+ {
+ *h_errnop = HOST_NOT_FOUND;
+-if (buffer_size)
++if (buffer_size == NULL)
++ *status = NSS_STATUS_NOTFOUND;
++else
+ *result = NULL;
+ goto done;
+ }
+@@ -190,7 +197,7 @@ __nss_hostname_digits_dots (const char *name, struct
hostent *resbuf,
+ if (buffer_size == NULL)
+ *status = NSS_STATUS_SUCCESS;
+ else
+- *result = resbuf;
++ *result = resbuf;
+ goto done;
+ }
+
+@@ -201,15 +208,6 @@ __nss_hostname_digits_dots (const char *name, struct
hostent *resbuf,
+
+ if ((isxdigit (name[0]) strchr (name, ':') != NULL) || name[0] ==
':')
+ {
+-const char *cp;
+-char *hostname;
+-typedef unsigned char host_addr_t[16];
+-host_addr_t *host_addr;
+-typedef char *host_addr_list_t[2];
+-host_addr_list_t *h_addr_ptrs;
+-size_t size_needed;
+-int addr_size;
+-
+ switch (af)
+ {
+ default:
+@@ -225,7
[packages/glibc] Created branch CVE-2015-0235
The branch 'CVE-2015-0235' was created. Summary of new commits: 90da310... fix for CVE-2015-0235 aka GHOST: glibc gethostbyname, buffe ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/mpv] - up to 0.7.3 - choose libswresample over libavresample
commit eab2fe552434091430d8bd7633987bd8cfb90d36
Author: Jan Palus at...@pld-linux.org
Date: Tue Jan 27 22:36:09 2015 +0100
- up to 0.7.3
- choose libswresample over libavresample
mpv.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/mpv.spec b/mpv.spec
index b2e789b..177d13c 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -1,11 +1,11 @@
Summary: Movie player based on MPlayer and mplayer2
Name: mpv
-Version: 0.7.2
+Version: 0.7.3
Release: 1
License: GPL v2+
Group: Applications/Multimedia
Source0:
http://github.com/mpv-player/mpv/archive/v%{version}.tar.gz?/%{name}-%{version}.tar.gz
-# Source0-md5: 5081934235bf1d531364f59e5f718024
+# Source0-md5: 894e712235574fb78077e388f10c1cdd
Source1: %{name}.conf
Patch0:%{name}-lua.patch
URL: http://mpv.io/
@@ -123,13 +123,13 @@ zsh-completion for mpv.
--enable-libass-osd \
--enable-libavdevice \
--enable-libavfilter \
- --enable-libavresample \
--enable-libbluray \
--enable-libbs2b \
--enable-libguess \
--enable-libmpv-shared \
--enable-libpostproc \
--enable-libsmbclient \
+ --enable-libswresample \
--enable-libv4l2 \
--enable-lirc \
--enable-mpg123 \
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mpv.git/commitdiff/eab2fe552434091430d8bd7633987bd8cfb90d36
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
