use new kernel macros

diff --git a/acpi_call.spec b/acpi_call.spec
index 17918aab0260d5765074dc7934fa0368b24bac96..454aa35b5399e58fb90ec7500eb51e13e6a544fa 100644 (file)
--- a/acpi_call.spec
+++ b/acpi_call.spec
@@ -1,77 +1,78 @@
-#
 # Conditional build:
-%bcond_without dist_kernel     # allow non-distribution kernel
 %bcond_without kernel          # don't build kernel modules
-%bcond_with    verbose         # verbose build (V=1)
+%bcond_without userspace       # don't build userspace tools
 
-%if %{without kernel}
-%undefine      with_dist_kernel
+%if 0%{?_pld_builder:1} && %{with kernel} && %{with userspace}
+%{error:kernel and userspace cannot be built at the same time on PLD builders}
+exit 1
 %endif
 
-%define                rel     0.3
+%define                rel     1
 %define                pname   acpi_call
 Summary:       A linux kernel module that enables calls to ACPI methods through /proc/acpi/call
-Name:          %{pname}%{_alt_kernel}
+Name:          %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
 Version:       1.1.0
-Release:       %{rel}
+Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       https://github.com/mkottman/acpi_call/archive/v%{version}/%{pname}-%{version}.tar.gz
 # Source0-md5: f69d40e130b0e5ed17ce8adb19e6dda1
 Patch0:                %{pname}-build.patch
 URL:           https://github.com/mkottman/acpi_call
-%if %{with kernel}
-%if %{with dist_kernel}
-BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.20.2
-%endif
-BuildRequires: rpmbuild(macros) >= 1.379
-%endif
+%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
+BuildRequires: rpmbuild(macros) >= 1.701
 ExclusiveArch: %{ix86} %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 A linux kernel module that enables calls to ACPI methods through
-/proc/acpi/call
+/proc/acpi/call.
 
-%package -n kernel%{_alt_kernel}-misc-acpi_call
-Summary:       A linux kernel module that enables calls to ACPI methods through /proc/acpi/call
-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
+%define        kernel_pkg()\
+%package -n kernel%{_alt_kernel}-misc-acpi_call\
+Summary:       A linux kernel module that enables calls to ACPI methods through /proc/acpi/call\
+Release:       %{rel}@%{_kernel_ver_str}\
+Group:         Base/Kernel\
+Requires(post,postun): /sbin/depmod\
+%requires_releq_kernel\
+Requires(postun):      %releq_kernel\
+\
+%description -n kernel%{_alt_kernel}-misc-acpi_call\
+A linux kernel module that enables calls to ACPI methods through\
+/proc/acpi/call.\
+%files -n kernel%{_alt_kernel}-misc-acpi_call\
+%defattr(644,root,root,755)\
+%doc README.md\
+/lib/modules/%{_kernel_ver}/misc/acpi_call.ko*\
+\
+%post  -n kernel%{_alt_kernel}-misc-acpi_call\
+%depmod %{_kernel_ver}\
+\
+%postun        -n kernel%{_alt_kernel}-misc-acpi_call\
+%depmod %{_kernel_ver}\
+%{nil}
 
-%description -n kernel%{_alt_kernel}-misc-acpi_call
-A linux kernel module that enables calls to ACPI methods through
-/proc/acpi/call
+%define build_kernel_pkg()\
+%build_kernel_modules -m acpi_call\
+%install_kernel_modules -D installed -m acpi_call -d misc\
+%{nil}
+
+%{?with_kernel:%{expand:%create_kernel_packages}}
 
 %prep
-%setup -q
+%setup -q -n %{pname}-%{version}
 %patch0 -p1
 
 %build
-%if %{with kernel}
-%build_kernel_modules -m acpi_call
-%endif
+%{?with_kernel:%{expand:%build_kernel_packages}}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%install_kernel_modules -m acpi_call -d misc
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post  -n kernel%{_alt_kernel}-misc-acpi_call
-%depmod %{_kernel_ver}
-
-%postun        -n kernel%{_alt_kernel}-misc-acpi_call
-%depmod %{_kernel_ver}
 
 %if %{with kernel}
-%files -n kernel%{_alt_kernel}-misc-acpi_call
-%defattr(644,root,root,755)
-%doc README.md
-/lib/modules/%{_kernel_ver}/misc/*.ko*
+install -d $RPM_BUILD_ROOT
+cp -a installed/* $RPM_BUILD_ROOT
 %endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT