From 9273d37b58daca2c7702b1dac9fb5139e6a40125 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sun, 20 Apr 2008 16:10:19 +0000 Subject: [PATCH 1/4] Initialize branch F-9 for diveintopython --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From a7f2bf833e9fd9c95408031a60b8853ae9539423 Mon Sep 17 00:00:00 2001 From: Marc Wiriadisastra Date: Wed, 5 Nov 2008 12:30:42 +0000 Subject: [PATCH 2/4] Fix file location problem that breaks HTML version - thanks to Paul --- diveintopython.spec | 14 ++++++++++++-- import.log | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 import.log diff --git a/diveintopython.spec b/diveintopython.spec index 18c9d53..3fc4afc 100644 --- a/diveintopython.spec +++ b/diveintopython.spec @@ -1,6 +1,6 @@ Name: diveintopython Version: 5.4 -Release: 12%{?dist} +Release: 14%{?dist} Summary: Dive into Python - a python book @@ -76,7 +76,7 @@ rm -rf txt/*.html #install the files find . -type d -exec mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/'{}' \; for DIR in * ; do - find $DIR -type f -exec install -m 0644 '{}' $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/${DIR}/ \; + find $DIR -type f -exec install -D -m 0644 '{}' $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/'{}' \; done popd @@ -98,23 +98,33 @@ rm -rf $RPM_BUILD_ROOT %files html %defattr(-,root,root,-) +%dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/html %files pdf %defattr(-,root,root,-) +%dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/pdf %{_datadir}/applications/fedora-diveintopython.desktop %files single-html %defattr(-,root,root,-) +%dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/htmlflat %files txt %defattr(-,root,root,-) +%dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/txt %changelog +* Tue Nov 4 2008 Paul W. Frields - 5.4-14 +- Fix file location problem that breaks HTML version + +* Tue Sep 2 2008 Michael Schwendt - 5.4-13 +- Include /usr/share/doc/diveintopython-5.4 directory (in all pkgs) + * Tue Feb 5 2008 Marc Wiriadisastra - 5.4-12 - Removed specific java package's and just use java in BR (overholt) - Added build_patch to not use downloaded jars and.... diff --git a/import.log b/import.log new file mode 100644 index 0000000..66dbc48 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +diveintopython-5_4-14_fc10:F-9:diveintopython-5.4-14.fc10.src.rpm:1225888211 From 783ce23cdfd1f1513f9a03b12ddc544aa4dd048b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:23:15 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 427eb90..316d8b4 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: diveintopython -# $Id$ +# $Id: Makefile,v 1.1 2008/01/10 16:38:51 kevin Exp $ NAME := diveintopython 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 7f44e04d05fd7fa4ae3a3079f576790b565894f0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 13:04:04 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log 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 316d8b4..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: diveintopython -# $Id: Makefile,v 1.1 2008/01/10 16:38:51 kevin Exp $ -NAME := diveintopython -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 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9 diff --git a/import.log b/import.log deleted file mode 100644 index 66dbc48..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -diveintopython-5_4-14_fc10:F-9:diveintopython-5.4-14.fc10.src.rpm:1225888211