rpms/wmacpi/EL-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 wmacpi.spec, 1.4, 1.5

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/wmacpi/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12372/EL-5

Modified Files:
	.cvsignore sources wmacpi.spec 
Log Message:
sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wmacpi/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Aug 2005 10:55:43 -0000	1.2
+++ .cvsignore	28 May 2008 08:03:23 -0000	1.3
@@ -1 +1 @@
-wmacpi-1.34.tar.gz
+wmacpi-2.2rc1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wmacpi/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Aug 2005 10:55:43 -0000	1.2
+++ sources	28 May 2008 08:03:23 -0000	1.3
@@ -1 +1 @@
-ef4f5f94102a7f5cbaa71a8f0a4a2c3b  wmacpi-1.34.tar.gz
+c050d9b54f0d0061e196160ae35775f6  wmacpi-2.2rc1.tar.bz2


Index: wmacpi.spec
===================================================================
RCS file: /cvs/extras/rpms/wmacpi/EL-5/wmacpi.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wmacpi.spec	15 Sep 2006 13:41:35 -0000	1.4
+++ wmacpi.spec	28 May 2008 08:03:23 -0000	1.5
@@ -1,17 +1,18 @@
 Name:           wmacpi
-Version:        1.34
-Release:        7%{?dist}
+Version:        2.2
+Release:        0.2.rc1%{?dist}
 Summary:        Dockapp for laptop acpi/apm information
 
 Group:          User Interface/X
-License:        GPL
-URL:           	http://www.ne.jp/asahi/linux/timecop/
-Source0: http://www.ne.jp/asahi/linux/timecop/software/wmacpi-%{version}.tar.gz
+License:        GPLv2+
+URL:            http://himi.org/wmacpi/
+Source0:        http://himi.org/wmacpi/download/wmacpi-2.2rc1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libX11-devel
 BuildRequires:  libXext-devel
-BuildRequireS:  libXpm-devel
+BuildRequires:  libXpm-devel
+BuildRequires:  libdockapp-devel
 
 %description
 Dockapp which displays acpi/apm information.
@@ -24,12 +25,12 @@
 battery level is critical low.
 
 %prep
-%setup -q
-
+%setup -q -n %{name}-%{version}rc1
 
 %build
-make CFLAGS="$RPM_OPT_FLAGS -DACPI -ansi -I%{_prefix}/X11R6/include" \
-LDFLAGS="$RPM_OPT_FLAGS -DACPI -L%{_prefix}/X11R6/%{_lib} -lX11 -lXpm -lXext" \
+# -lXpm -lXext are not directly needed, only through libdockapp
+make CFLAGS="$RPM_OPT_FLAGS -ansi" \
+LDFLAGS="$RPM_OPT_FLAGS -lX11 -ldockapp" \
 %{?_smp_mflags}
 
 
@@ -37,7 +38,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_bindir}
-%{__install} %{_builddir}/%{name}-%{version}/wmacpi ${RPM_BUILD_ROOT}%{_bindir}
+%{__install} %{_builddir}/%{name}-%{version}rc1/wmacpi ${RPM_BUILD_ROOT}%{_bindir}
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_mandir}/man1
+%{__install} -m644 -p wmacpi.1 ${RPM_BUILD_ROOT}%{_mandir}/man1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,10 +48,23 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
+%doc AUTHORS COPYING README ChangeLog
 %{_bindir}/wmacpi
+%{_mandir}/man1/wmacpi.1*
 
 %changelog
+* Thu Aug 23 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 2.2-0.2.rc1
+- version upgrade
+- new license tag
+
+* Tue Jan 23 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.2-0.1.a1
+- version upgrade (#201851)
+
+* Wed Jan 10 2007 Patrice Dumas <pertusus[AT]free.fr> 2.1-1
+- update to 2.1
+
 * Fri Sep 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.34-7
 - FE6 rebuild