rpms/tpctl/devel tpctl-4.8-alt-cli.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tpctl.spec, 1.4, 1.5

[Ville Skytta (scop)]

Changeset from: scop

Update of /cvs/extras/rpms/tpctl/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv21728

Modified Files:
	.cvsignore sources tpctl.spec 
Added Files:
	tpctl-4.8-alt-cli.patch 
Log Message:
"Update" to 4.15, fix tpctlir build on FC2+ (b.f.u #2301).

tpctl-4.8-alt-cli.patch:

--- NEW FILE tpctl-4.8-alt-cli.patch ---
diff -ruN tpctl-4.8.orig/tpctlir/tpctlir.c tpctl-4.8/tpctlir/tpctlir.c
--- tpctl-4.8.orig/tpctlir/tpctlir.c	2003-12-08 10:27:01 +0300
+++ tpctl-4.8/tpctlir/tpctlir.c	2003-12-08 16:46:02 +0300
@@ -1,4 +1,7 @@
-#include <asm/system.h>
+/* from <asm/system.h> */
+#define __cli()		__asm__ __volatile__("cli": : :"memory")
+#define __sti()		__asm__ __volatile__("sti": : :"memory")
+
 #include <sys/io.h>
 #include <stdio.h>
 
@@ -29,7 +32,7 @@
         return 2;
     }
 
-    cli();
+    __cli();
 
     val94 = inb(0x94);              /* POS mask register */
     outb(0xfE, 0x94);               /* mask bit (0) for IR; changes enabled */
@@ -44,7 +47,7 @@
     outb(val94, 0x94);              /* restore POS mask to prevent changing */
     outb(val94, 0x47);              /* pause */
 
-    sti();
+    __sti();
 
     return 0;
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tpctl/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 05:28:42 -0000	1.3
+++ .cvsignore	27 Nov 2004 17:05:11 -0000	1.4
@@ -1 +1,2 @@
 tpctl_4.14.tar.gz
+tpctl_4.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tpctl/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 05:28:42 -0000	1.3
+++ sources	27 Nov 2004 17:05:11 -0000	1.4
@@ -1 +1 @@
-4515f89be7c9e7c464bc373d3c56ca81  tpctl_4.14.tar.gz
+d8d84c592dfae6f53cf43824c0c78506  tpctl_4.15.tar.gz


Index: tpctl.spec
===================================================================
RCS file: /cvs/extras/rpms/tpctl/devel/tpctl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tpctl.spec	8 Nov 2004 05:28:54 -0000	1.4
+++ tpctl.spec	27 Nov 2004 17:05:11 -0000	1.5
@@ -1,18 +1,17 @@
-%define tpctlir %{?_without_tpctlir:0}%{!?_without_tpctlir:1}
-
 Name:           tpctl
-Version:        4.14
-Release:        0.fdr.1.2
+Version:        4.15
+Release:        1
 Epoch:          0
 Summary:        IBM ThinkPad configuration tools
 
 Group:          System Environment/Base
 License:        GPL
 URL:            http://tpctl.sourceforge.net/
-Source0:        http://download.sourceforge.net/tpctl/tpctl_4.14.tar.gz
+Source0:        http://download.sourceforge.net/tpctl/tpctl_4.15.tar.gz
 Source1:        %{name}.apmiser.init
 Patch0:         %{name}-rpm.patch
 Patch1:         %{name}-optflags.patch
+Patch2:         %{name}-4.8-alt-cli.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(id -u -n)
 
 BuildRequires:  ncurses-devel, libtool
@@ -37,16 +36,13 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%if %{tpctlir}
+%patch2 -p1
 cp -p tpctlir/README README.tpctlir
-%endif
 
 
 %build
 CC=%{__cc} make %{?_smp_mflags} all
-%if %{tpctlir}
 CC=%{__cc} make %{?_smp_mflags} -C tpctlir
-%endif
 
 
 %install
@@ -60,9 +56,7 @@
 install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/apmiser
 install -dm 755 $RPM_BUILD_ROOT%{_mandir}/man8
 install -pm 644 man/apmiser.8 $RPM_BUILD_ROOT%{_mandir}/man8
-%if %{tpctlir}
 install -pm 644 tpctlir/tpctlir.8 $RPM_BUILD_ROOT%{_mandir}/man8
-%endif
 
 
 %clean
@@ -89,12 +83,10 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README* SUPPORTED* TROUBLE* VGA-MODES
 %{_bindir}/*tpctl
+%{_sbindir}/tpctlir
 %{_libdir}/libsmapidev.so.*
 %{_mandir}/man1/*tpctl.1*
-%if %{tpctlir}
-%{_sbindir}/tpctlir
 %{_mandir}/man8/tpctlir.8*
-%endif
 
 %files -n apmiser
 %defattr(-,root,root,-)
@@ -105,6 +97,11 @@
 
 
 %changelog
+* Sat Nov 27 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:4.15-1
+- Vanity update to 4.15, only changelog changed.
+- Apply tpctlir patch from ALT Linux's tpctl-4.15-alt1, always build it
+  (bugzilla.fedora.us #2301).
+
 * Thu May 20 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:4.14-0.fdr.1
 - Update to 4.14.
 - Make tpctlir build optional due to problems with kernel 2.6,