From b1f1067b69eb957a9af3790dd5dbed8a6240e752 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Apr 22 2005 16:23:04 +0000
Subject: - fix debuginfo generation

- don't package shared or devel libs (battstat-applet was ported)
- since the libraries aren't needed, don't ship ppc

---

diff --git a/apmd-3.2-build.patch b/apmd-3.2-build.patch
index 3a24a78..4c89347 100644
--- a/apmd-3.2-build.patch
+++ b/apmd-3.2-build.patch
@@ -20,3 +20,27 @@
  XTRACFLAGS=-Wall -pipe -I. -I/usr/src/linux/include \
  		-I/usr/src/linux-2.2/include -I /usr/src/linux-2.0/include \
  		-DVERSION=\"$(VERSION)\" \
+Only in apmd-foo: apm
+Only in apmd-foo: apmd
+Only in apmd-foo: apmd.lo
+Only in apmd-foo: apmd.o
+Only in apmd-foo: apmlib.lo
+Only in apmd-foo: apmlib.o
+Only in apmd-foo: apm.lo
+Only in apmd-foo: apmsleep
+Only in apmd-foo: apmsleep.lo
+Only in apmd-foo: apmsleep.o
+Only in apmd-foo: libapm.la
+Only in apmd-foo: .libs
+diff -ru apmd-3.2.2.orig/Makefile apmd-foo/Makefile
+--- apmd-3.2.2.orig/Makefile	2005-04-22 12:10:21.000000000 -0400
++++ apmd-foo/Makefile	2005-04-22 12:12:04.000000000 -0400
+@@ -60,7 +60,7 @@
+ 
+ LIBTOOL=libtool --quiet
+ LT_COMPILE = $(LIBTOOL) --mode=compile $(CC)
+-LT_LINK = $(LIBTOOL) --mode=link $(CC)
++LT_LINK = $(LIBTOOL) --mode=link $(CC) -static
+ LT_INSTALL = $(LIBTOOL) --mode=install install
+ LT_CLEAN = $(LIBTOOL) --mode=clean rm
+ 
diff --git a/apmd.spec b/apmd.spec
index a5f0564..059b536 100644
--- a/apmd.spec
+++ b/apmd.spec
@@ -1,7 +1,7 @@
 Summary: Advanced Power Management (APM) BIOS utilities for laptops.
 Name: apmd
 Version: 3.2.2
-Release: 2
+Release: 3
 Source: ftp://ftp.debian.org/debian/pool/main/a/apmd/%{name}_%{version}.orig.tar.gz
 Source1: apmd.init
 Source2: apmscript
@@ -11,12 +11,12 @@ Patch1: apmd-3.2-umask.patch
 Patch2: apmd-3.2-error.patch
 Patch4: apmd-3.2-x.patch
 Epoch: 1
-License: GPL/LGPL
+License: GPL
 Group: System Environment/Daemons
 Prereq: chkconfig
 Requires: pm-utils
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-ExclusiveArch: %{ix86} ppc
+ExclusiveArch: %{ix86}
 
 %description
 APMD is a set of programs for controlling the Advanced Power 
@@ -38,7 +38,7 @@ iconv -f iso-8859-1 -t utf-8 < apmsleep.fr.1 > apmsleep.fr.1_
 mv apmsleep.fr.1_ apmsleep.fr.1
 
 %build
-make CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=-s
+make CFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -60,6 +60,7 @@ install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/apm-scripts/
 install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/apmd
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/apmd_proxy
 rm -rf $RPM_BUILD_ROOT%{_bindir}/on_ac_power
+rm -rf $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_includedir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -88,14 +89,17 @@ fi
 %lang(fr) %{_mandir}/fr/man?/*
 %{_bindir}/*
 %{_sbindir}/*
-%{_includedir}/*
-%{_libdir}/*
 %config /etc/rc.d/init.d/apmd
 %config(noreplace) /etc/sysconfig/apmd
 %dir /etc/sysconfig/apm-scripts
 %config /etc/sysconfig/apm-scripts/*
 
 %changelog
+* Fri Apr 22 2005 Bill Nottingham <notting@redhat.com> - 1:3.2.2-3
+- remove shared/devel libs - nothing uses them (fixes #155724)
+- since they're not needed, turn off ppc build
+- fix debuginfo generation
+
 * Wed Apr 13 2005 Bill Nottingham <notting@redhat.com> - 1:3.2.2-2
 - remove on_ac_power in favor of apm/acpi/etc neutral version
 - require pm-utils, where said version lives