rpms/yacpi/F-9 yacpi-3.0.1.patch, NONE, 1.1 yacpi.spec, NONE, 1.1 sources, 1.1, 1.2

[Sven Lankes]

Author: slankes

Update of /cvs/pkgs/rpms/yacpi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25402

Modified Files:
	sources 
Added Files:
	yacpi-3.0.1.patch yacpi.spec 
Log Message:
First import of F-9 branch


yacpi-3.0.1.patch:

--- NEW FILE yacpi-3.0.1.patch ---
diff -Naur yacpi-3.0.1-orig/Makefile yacpi-3.0.1/Makefile
--- yacpi-3.0.1-orig/Makefile	2007-10-30 17:39:43.000000000 +0100
+++ yacpi-3.0.1/Makefile	2008-08-02 11:21:21.000000000 +0200
@@ -4,7 +4,7 @@
 #  ---------------------------------------------
 
 BIN     = yacpi
-prefix  = /usr/local
+prefix  = /usr
 INSPATH = ${prefix}/bin/
 CFLAGS  = -O2 -Wall -g -DVERSION=\"${VERSION}\"
 CC      = cc
@@ -21,8 +21,7 @@
 	@${CC} -c ${CFLAGS} $<
 
 all : options ${OBJ_yacpi} ${OBJ_get_cpu}
-	@${CC} -Wall get_cpu.o yacpi.o -o ${BIN} -lncurses -lacpi
-	@strip ${BIN}
+	@${CC} ${CFLAGS} get_cpu.o yacpi.o -o ${BIN} -lncurses -lacpi
 	@echo built yacpi
 
 dist : clean
@@ -40,12 +39,12 @@
 	@echo "BIN    = ${BIN}"
 
 install :
-	@mkdir -p ${DOCPATH}
-	@mkdir -p ${INSPATH}
-	@mkdir -p ${MANPATH}
-	install -m644 CHANGELOG README THANKS COPYING ${DOCPATH}
-	install -m644 yacpi.1 ${MANPATH}
-	install ${BIN} ${INSPATH}
+	@mkdir -p ${DESTDIR}/${DOCPATH}
+	@mkdir -p ${DESTDIR}/${INSPATH}
+	@mkdir -p ${DESTDIR}/${MANPATH}
+	install -p -m644 CHANGELOG README THANKS COPYING ${DESTDIR}/${DOCPATH}
+	install -p -m644 yacpi.1 ${DESTDIR}/${MANPATH}
+	install -p ${BIN} ${DESTDIR}/${INSPATH}
 
 uninstall :
 	rm -f ${INSPATH}${BIN}


--- NEW FILE yacpi.spec ---
Name:           yacpi
Version:        3.0.1
Release:        11%{?dist}
Summary:        Yet Another Configuration and Power Interface 

Group:          Applications/System
License:        GPLv2+
URL:            http://www.ngolde.de/yacpi.html 
Source0:        http://www.ngolde.de/download/%{name}-%{version}.tar.gz  
Patch0:         %{name}-%{version}.patch
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  ncurses-devel 
BuildRequires:  libacpi-devel 
ExcludeArch:    ppc ppc64

%description
Yacpi is an acpi monitoring program for Linux. It displays acpi information 
like battery status, ac status, cpu frequency, remaining battery/charge 
time, temperature... It also supports the use of more than one battery and 
can display them. 

%prep
%setup -q
%patch0 -p1
sed -i "s/CFLAGS  = -O2 -Wall -g/CFLAGS = $RPM_OPT_FLAGS/" Makefile
sed -i "s&share/doc/%{name}&share/doc/%{name}-%{version}&" Makefile


%build
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

#fix convert changelog to UTF8
iconv -f ISO_8859-1 -t UTF-8 -o $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}-%{version}/CHANGELOG{.utf8,}
mv $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}-%{version}/CHANGELOG{.utf8,}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/%{name}
%dir %{_defaultdocdir}/%{name}-%{version}
%doc %{_defaultdocdir}/%{name}-%{version}/CHANGELOG
%doc %{_defaultdocdir}/%{name}-%{version}/COPYING
%doc %{_defaultdocdir}/%{name}-%{version}/README
%doc %{_defaultdocdir}/%{name}-%{version}/THANKS
%{_mandir}/man1/%{name}.1.gz



%changelog
* Tue Aug 19 2008 Sven Lankes <sven at lank.es> - 3.0.1-11
- add ExcludeArch ppc ppc64

* Sat Aug  2 2008 Sven Lankes <sven at lank.es> - 3.0.1-10
- updated Makefile patch to:
- actually use the set cflags 
- not strip the binary so that we get a -debuginfo package 

* Mon Jul  7 2008 slankes <sven at lank.es> - 3.0.1-9
- minor specfile tweaks

* Thu May  8 2008 slankes <sven at lank.es> - 3.0.1-8
- save doc in name-version instead of version

* Thu May  8 2008 slankes <sven at lank.es> - 3.0.1-7
- drop explicit depencency on ncurses
- rework Makefile-patch
- Replace CFLAGS with RPM_OPT_FLAGS

* Mon May  5 2008 slankes <sven at lank.es> - 3.0.1-6
- Use correct license
- Various specfile cleanups

* Sat May  3 2008 slankes <sven at lank.es> - 3.0.1-5
- Convert CHANGELOG to UTF-8 

* Sat May  3 2008 slankes <sven at lank.es> - 3.0.1-4
- First package version



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yacpi/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Aug 2008 20:59:25 -0000	1.1
+++ sources	18 Sep 2008 19:18:26 -0000	1.2
@@ -0,0 +1 @@
+1b03394ee3b916f686cdc3e2c05ddb7a  yacpi-3.0.1.tar.gz