Merge remote-tracking branch 'bboozzoo/master'

Author: evgeni

Makefile

@@ -32,7 +32,8 @@ endif
 
 DEBUG := 0
 
-.PHONY: default clean modules load unload install patch check_hdaps mk-hdaps.diff
+.PHONY: default clean modules load unload install patch check_hdaps mk-hdaps.diff \
+	check-ver set-version create-tgz create-rpm
 export TP_MODULES
 
 #####################################################################
@@ -141,18 +142,31 @@ patch: $(KSRC)
 #####################################################################
 # Tools for preparing a release. Ignore these.
 
-set-version:
+TGZ=../tp_smapi-$(VER).tgz
+
+check-ver:
+	@if [ -z "$(VER)" ]; then \
+		echo "VER is unset"; \
+		echo "run: $(MAKE) $(MAKECMDGOALS) VER=<release version>"; \
+		exit 1 ;\
+	 fi
+
+set-version: check-ver
 	perl -i -pe 's/^(tp_smapi version ).*/$${1}$(VER)/' README
 	perl -i -pe 's/^(#define TP_VERSION ").*/$${1}$(VER)"/' thinkpad_ec.c tp_smapi.c
 	perl -i -pe 's/^(TP_VER := ).*/$${1}$(VER)/' Makefile
 	perl -i -pe 's/^(PACKAGE_VERSION=").*/$${1}$(VER)"/' dkms.conf
 
-TGZ=../tp_smapi-$(VER).tgz
-create-tgz:
+create-tgz: check-ver
 	git archive  --format=tar --prefix=tp_smapi-$(VER)/ HEAD | gzip -c > $(TGZ)
 	tar tzvf $(TGZ)
 	echo "Ready: $(TGZ)"
 
+create-rpm: create-tgz
+	mkdir -p rpmbuild
+	rpmbuild -tb --define "_topdir $$PWD/rpmbuild" $(TGZ)
+
+
 else
 #####################################################################
 # This part runs as a submake in kernel Makefile context:

tp_smapi.spec

@@ -0,0 +1,55 @@
+%define module tp_smapi
+%define version 0.41
+
+Name:           %{module}
+Version:        %{version}
+Release:        1%{?dist}
+Summary:        IBM ThinkPad hardware functions driver - DKMS version
+Group:          Kernel/Drivers
+License:        GPLv2
+Source0:        %{module}-%{version}.tgz
+
+Requires:       dkms >= 1.00
+Requires:       kernel-headers
+Requires:       kernel-devel
+
+BuildArch:      noarch
+
+
+%description 
+The package contains kernel driver for ThinkPad SMAPI (System
+Management Application Program Interface). The driver is built using
+DKMS.
+
+%prep
+%setup -q
+
+
+%install
+if [ "$RPM_BUILD_ROOT" != "/" ]; then
+	rm -rf $RPM_BUILD_ROOT
+fi
+mkdir -p $RPM_BUILD_ROOT/usr/src/%{module}-%{version}/
+cp -rf * $RPM_BUILD_ROOT/usr/src/%{module}-%{version}
+
+%clean
+if [ "$RPM_BUILD_ROOT" != "/" ]; then
+	rm -rf $RPM_BUILD_ROOT
+fi
+
+%files
+%defattr(-,root,root)
+%doc README TODO
+%{_usrsrc}/%{module}-%{version}/
+
+%doc
+
+%post
+dkms add -m %{module} -v %{version} --rpm_safe_upgrade
+dkms build -m %{module} -v %{version}
+dkms install -m %{module} -v %{version}
+
+%preun
+dkms remove -m %{module} -v %{version} --all --rpm_safe_upgrade
+
+%changelog