From 05e93771a11eaf161c31b37ea09dc71dbb6aa422 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 05:09:18 +0000 Subject: [PATCH 1/5] Initialize branch F-11 for w3m-el --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 481195ba06e304382789c1da8b2438a36dac71b3 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Wed, 19 Aug 2009 04:30:04 +0000 Subject: [PATCH 2/5] - Snapshot from CVS to fix #518058. --- .cvsignore | 1 + sources | 2 +- w3m-el.spec | 17 ++++++++++++----- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0904957..997e46b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ emacs-w3m-1.4.3.tar.gz emacs-w3m-1.4.4.tar.gz +emacs-w3m-1.4.367.tar.gz diff --git a/sources b/sources index c3c5aba..cc3b683 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6e592a9c0ab22fb532ebc3bcb21a45b1 emacs-w3m-1.4.4.tar.gz +43602bfc10c859ed1741cb1b8e7e86a8 emacs-w3m-1.4.367.tar.gz diff --git a/w3m-el.spec b/w3m-el.spec index 89a133f..d8763f6 100644 --- a/w3m-el.spec +++ b/w3m-el.spec @@ -1,8 +1,9 @@ %define xemacsver 21.4.11 +%define alphatag 20090819cvs Name: w3m-el -Version: 1.4.4 -Release: 8%{?dist} +Version: 1.4.367 +Release: 0.1.%{alphatag}%{?dist} License: BSD URL: http://emacs-w3m.namazu.org/ BuildArch: noarch @@ -72,9 +73,9 @@ rm -rf $RPM_BUILD_ROOT # %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,12 @@ fi %{_infodir}/* %changelog +* 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 From 37ecb517b8620d58a3dbdc5a3614af6ab872dfdd Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Thu, 19 Nov 2009 08:01:33 +0000 Subject: [PATCH 3/5] - updates. --- .cvsignore | 1 + sources | 2 +- w3m-el.spec | 13 ++++++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 997e46b..74eb667 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +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/sources b/sources index cc3b683..6622e4e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -43602bfc10c859ed1741cb1b8e7e86a8 emacs-w3m-1.4.367.tar.gz +a2e1da8e62a46d7390281adb01a38c68 emacs-w3m-1.4.371.tar.gz diff --git a/w3m-el.spec b/w3m-el.spec index d8763f6..cbac79c 100644 --- a/w3m-el.spec +++ b/w3m-el.spec @@ -1,8 +1,8 @@ %define xemacsver 21.4.11 -%define alphatag 20090819cvs +%define alphatag 20091119cvs Name: w3m-el -Version: 1.4.367 +Version: 1.4.371 Release: 0.1.%{alphatag}%{?dist} License: BSD URL: http://emacs-w3m.namazu.org/ @@ -56,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 @@ -65,8 +65,8 @@ 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 @@ -135,6 +135,9 @@ 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. From 4d2fd71bd81b9b32b37b59480defec75f985021f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:14:58 +0000 Subject: [PATCH 4/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1c6a66b..19cabb1 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From f73bac4d64dc61baa070c046fea65296987073a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:11:38 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 19cabb1..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 $$d/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/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11