diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 0904957..0000000 --- a/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -emacs-w3m-1.4.3.tar.gz -emacs-w3m-1.4.4.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..74eb667 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +emacs-w3m-1.4.3.tar.gz +emacs-w3m-1.4.4.tar.gz +emacs-w3m-1.4.367.tar.gz +emacs-w3m-1.4.371.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index 1c6a66b..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: w3m-el -# $Id$ -NAME := w3m-el -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) diff --git a/sources b/sources index c3c5aba..6622e4e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6e592a9c0ab22fb532ebc3bcb21a45b1 emacs-w3m-1.4.4.tar.gz +a2e1da8e62a46d7390281adb01a38c68 emacs-w3m-1.4.371.tar.gz diff --git a/w3m-el.spec b/w3m-el.spec index 89a133f..cbac79c 100644 --- a/w3m-el.spec +++ b/w3m-el.spec @@ -1,8 +1,9 @@ %define xemacsver 21.4.11 +%define alphatag 20091119cvs Name: w3m-el -Version: 1.4.4 -Release: 8%{?dist} +Version: 1.4.371 +Release: 0.1.%{alphatag}%{?dist} License: BSD URL: http://emacs-w3m.namazu.org/ BuildArch: noarch @@ -55,7 +56,7 @@ This package contains common files which w3m-el and w3m-el-xemacs needs. %prep %setup -q -n emacs-w3m-%{version} -%__chmod a+x configure +chmod a+x configure %build @@ -64,17 +65,17 @@ This package contains common files which w3m-el and w3m-el-xemacs needs. %install rm -rf $RPM_BUILD_ROOT -%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d -%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d +install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d +install -d $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d # # for Emacs # %configure --with-icondir=\$\(prefix\)/share/pixmaps/w3m-el make -make install prefix=$RPM_BUILD_ROOT%{_prefix} datadir=$RPM_BUILD_ROOT%{_datadir} infodir=$RPM_BUILD_ROOT%{_infodir} +make install prefix=$RPM_BUILD_ROOT%{_prefix} datadir=$RPM_BUILD_ROOT%{_datadir} infodir=$RPM_BUILD_ROOT%{_infodir} INSTALL="/usr/bin/install -p" install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d -make install-icons prefix=$RPM_BUILD_ROOT%{_prefix} datadir=$RPM_BUILD_ROOT%{_datadir} +make install-icons prefix=$RPM_BUILD_ROOT%{_prefix} datadir=$RPM_BUILD_ROOT%{_datadir} INSTALL="/usr/bin/install -p" make distclean @@ -83,7 +84,7 @@ make distclean # %configure --with-xemacs --with-packagedir=\$\(datadir\)/xemacs/xemacs-packages --with-lispdir=\$\(datadir\)/xemacs/xemacs-packages/lisp/w3m --with-icondir=\$\(datadir\)/pixmaps/w3m-el make -make install-package prefix=$RPM_BUILD_ROOT%{_prefix} datadir=$RPM_BUILD_ROOT%{_datadir} +make install-package prefix=$RPM_BUILD_ROOT%{_prefix} datadir=$RPM_BUILD_ROOT%{_datadir} INSTALL="/usr/bin/install -p" install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d ## remove unpackaged files. @@ -134,6 +135,15 @@ fi %{_infodir}/* %changelog +* Thu Nov 19 2009 Akira TAGOH - 1.4.371-0.1.20091119cvs +- updates. + +* Wed Aug 19 2009 Akira TAGOH - 1.4.367-0.1.20090819cvs +- Snapshot from CVS to fix #518058. + +* Mon Jul 27 2009 Fedora Release Engineering - 1.4.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Feb 25 2009 Fedora Release Engineering - 1.4.4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild