rpms/acpid/devel acpid-2.0.2-makefile.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 acpid.spec, 1.36, 1.37 sources, 1.9, 1.10 acpid-1.0.8-makefile.patch, 1.1, NONE

Thu Feb 25 20:58:57 UTC 2010

Author: jskala

Update of /cvs/extras/rpms/acpid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12870

Modified Files:
	.cvsignore acpid.spec sources 
Added Files:
	acpid-2.0.2-makefile.patch 
Removed Files:
	acpid-1.0.8-makefile.patch 
Log Message:
* Thu Feb 25 2010 Jiri Skala <jskala at redhat.com> - 2.0.2-1
- latest upstream version


acpid-2.0.2-makefile.patch:
 Makefile |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE acpid-2.0.2-makefile.patch ---
diff -up acpid-2.0.2/Makefile.makefile acpid-2.0.2/Makefile
diff -up acpid-2.0.2/Makefile.makefile acpid-2.0.2/Makefile
diff -up acpid-2.0.2/Makefile.makefile acpid-2.0.2/Makefile
diff -up acpid-2.0.2/Makefile.makefile acpid-2.0.2/Makefile
diff -up acpid-2.0.2/Makefile.makefile acpid-2.0.2/Makefile
--- acpid-2.0.2/Makefile.makefile	2010-01-27 00:36:23.000000000 +0100
+++ acpid-2.0.2/Makefile	2010-02-25 16:01:39.641024017 +0100
@@ -31,8 +31,9 @@ MAN8GZ = $(MAN8:.8=.8.gz)
 
 DOCS = COPYING Changelog README TESTPLAN TODO 
 
-CFLAGS = -W -Wall -Werror -Wundef -Wshadow -D_GNU_SOURCE $(OPT) \
-	-fno-strict-aliasing -g $(DEFS)
+CFLAGS = -W -Wall -Werror -Wundef -Wshadow -D_GNU_SOURCE -O2 $(OPT) \
+	-fno-strict-aliasing -g $(DEFS) $(RPM_OPT_FLAGS) -fPIE
+LDFLAGS = -pie -Wl,-z,relro
 DEFS = -DVERSION="\"$(VERSION)\""
 
 all: $(PROGS)
@@ -46,8 +47,8 @@ man: $(MAN8)
 
 install_docs:
 	mkdir -p $(DESTDIR)/$(DOCDIR)
-	for a in $(DOCS); do install -m 0644 $$a $(DESTDIR)/$(DOCDIR) ; done
-	cp -a samples $(DESTDIR)/$(DOCDIR)
+	#for a in $(DOCS); do install -m 0644 $$a $(DESTDIR)/$(DOCDIR) ; done
+	#cp -a samples $(DESTDIR)/$(DOCDIR)
 
 install: $(PROGS) man install_docs
 	mkdir -p $(DESTDIR)/$(SBINDIR)
@@ -57,7 +58,7 @@ install: $(PROGS) man install_docs
 	mkdir -p $(DESTDIR)/$(MANDIR)/man8
 	install -m 0644 $(MAN8GZ) $(DESTDIR)/$(MANDIR)/man8
 	# If DESTDIR is empty and mandb exists, run it
-	[ -z "$(DESTDIR)" ] && which mandb 1>/dev/null 2>&1 && mandb -q
+	if test -z "$(DESTDIR)"; then which mandb 1>/dev/null 2>&1 && mandb -q; fi
 
 DISTTMP=/tmp
 DISTNAME=acpid-$(VERSION)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/acpid/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	23 Apr 2009 12:01:11 -0000	1.9
+++ .cvsignore	25 Feb 2010 20:58:57 -0000	1.10
@@ -1 +1 @@
-acpid-1.0.10.tar.gz
+acpid-2.0.2.tar.gz


Index: acpid.spec
===================================================================
RCS file: /cvs/extras/rpms/acpid/devel/acpid.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- acpid.spec	24 Jul 2009 16:34:17 -0000	1.36
+++ acpid.spec	25 Feb 2010 20:58:57 -0000	1.37
@@ -1,18 +1,18 @@
 Summary: ACPI Event Daemon
 Name: acpid
-Version: 1.0.10
-Release: 2%{?dist}
+Version: 2.0.2
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
-Source: http://prdownloads.sourceforge.net/acpid/acpid-%{version}.tar.gz
+Source: http://tedfelix.com/linux/acpid-%{version}.tar.gz
 Source1: acpid.init
 Source2: acpid.video.conf
 Source3: acpid.power.conf
 Source4: acpid.power.sh
-Patch1: acpid-1.0.8-makefile.patch
+Patch1: acpid-2.0.2-makefile.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: ia64 x86_64 %{ix86}
-URL: http://acpid.sourceforge.net/
+URL: http://tedfelix.com/linux/acpid-netlink.html
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -24,6 +24,7 @@ acpid is a daemon that dispatches ACPI e
 
 %prep
 %setup -q
+
 %patch1 -p1 -b .makefile
 
 %build
@@ -33,7 +34,7 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
-make install INSTPREFIX=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/acpi/actions
@@ -52,7 +53,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc COPYING README Changelog TODO
+%doc COPYING README Changelog TODO TESTPLAN
 %dir %{_sysconfdir}/acpi
 %dir %{_sysconfdir}/acpi/events
 %dir %{_sysconfdir}/acpi/actions
@@ -81,6 +82,9 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* Thu Feb 25 2010 Jiri Skala <jskala at redhat.com> - 2.0.2-1
+- latest upstream version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/acpid/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	23 Apr 2009 12:01:11 -0000	1.9
+++ sources	25 Feb 2010 20:58:57 -0000	1.10
@@ -1 +1 @@
-61156ef32015c56dc0f2e3317f4ae09e  acpid-1.0.10.tar.gz
+02eddc52bbd95602ac1f25de56067af1  acpid-2.0.2.tar.gz


--- acpid-1.0.8-makefile.patch DELETED ---

