dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-wmacpi-1.34.tar.gz

.gitignore

@@ -0,0 +1 @@
+wmacpi-2.2rc1.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: wmacpi
-# $Id$
-NAME := wmacpi
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-ef4f5f94102a7f5cbaa71a8f0a4a2c3b  wmacpi-1.34.tar.gz
+c050d9b54f0d0061e196160ae35775f6  wmacpi-2.2rc1.tar.bz2

wmacpi.spec

@@ -1,15 +1,16 @@
 Name:           wmacpi
-Version:        1.34
-Release:        4%{?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:  xorg-x11-devel
+BuildRequires:  libdockapp-devel
 
 %description
 Dockapp which displays acpi/apm information.
@@ -22,12 +23,12 @@ when battery is charging, and green LED inside the big button flashes red if
 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 -I%{_prefix}/X11R6/include" \
+LDFLAGS="$RPM_OPT_FLAGS -L%{_prefix}/X11R6/%{_lib} -lX11 -ldockapp" \
 %{?_smp_mflags}
 
 
@@ -35,7 +36,9 @@ LDFLAGS="$RPM_OPT_FLAGS -DACPI -L%{_prefix}/X11R6/%{_lib} -lX11 -lXpm -lXext" \
 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
@@ -43,10 +46,31 @@ rm -rf $RPM_BUILD_ROOT
 
 %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
+
+* Thu Feb 16 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.34-6
+- Rebuild for Fedora Extras 5
+
 * Sat Aug 20 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.34-4
 - better description