From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Tue, 9 Jun 2009 22:14:10 +0000 (+0000)
Subject: add the 4.7 taxonomy_block module which is a needed feature for plc
X-Git-Tag: drupal-4.7-12~2
X-Git-Url: http://git.onelab.eu/?p=drupal.git;a=commitdiff_plain;h=339c3af29b892a4b015f0e7f68b66c694ebcc6b3

add the 4.7 taxonomy_block module which is a needed feature for plc
---

diff --git a/Makefile b/Makefile
index 603945d..1ec1a24 100644
--- a/Makefile
+++ b/Makefile
@@ -9,11 +9,14 @@ version=4.7.11
 
 main.URL	:= http://ftp.drupal.org/files/projects/drupal-$(version).tar.gz
 main.SHA1SUM    := c9f767e6c2cd873c4b0bef1986e2821febfc7e34
-
 main.FILE	:= $(notdir $(main.URL))
 
+taxo.URL	:= http://ftp.drupal.org/files/projects/taxonomy_block-4.7.x-1.x-dev.tar.gz
+taxo.MD5SUM := a4ec6ea6f00cf400581a6be4baaf1fb6
+taxo.FILE	:= $(notdir $(taxo.URL))
+
 # Thierry - when called from within the build, PWD is /build
-SOURCEFILES := $(main.FILE)
+SOURCEFILES := $(main.FILE) $(taxo.FILE)
 
 $(main.FILE): #FORCE
 	@if [ ! -e "$@" ] ; then echo "$(CURL) $(main.URL)" ; $(CURL) $(main.URL) ; fi
@@ -27,6 +30,18 @@ $(main.FILE): #FORCE
 	    ls -l $@ ; \
 	fi
 
+$(taxo.FILE): #FORCE
+	@if [ ! -e "$@" ] ; then echo "$(CURL) $(taxo.URL)" ; $(CURL) $(taxo.URL) ; ln $@ taxonomy_block.tar.gz; fi
+	@if [ ! -e "$@" ] ; then echo "Could not download source file: $@ does not exist" ; exit 1 ; fi
+	@if test "$$(md5sum $@ | awk '{print $$1}')" != "$(taxo.MD5SUM)" ; then \
+	    echo "md5sum of the downloaded $@ does not match the one from 'sources' file" ; \
+	    echo "Local copy: $$(md5sum $@)" ; \
+	    echo "In sources: $(taxo.MD5SUM)" ; \
+	    exit 1 ; \
+	else \
+	    ls -l $@ ; \
+	fi
+
 sources: $(SOURCEFILES)
 .PHONY: sources
 
diff --git a/drupal.spec b/drupal.spec
index d0f1897..05d9453 100644
--- a/drupal.spec
+++ b/drupal.spec
@@ -23,6 +23,7 @@ URL: http://www.drupal.org
 Source0: http://ftp.osuosl.org/pub/drupal/files/projects/%{name}-%{version}.%{taglevel}.tar.gz
 #Source1: drupal.conf
 Source2: drupal-cron
+Source3: http://ftp.drupal.org/files/projects/taxonomy_block-4.7.x-1.x-dev.tar.gz
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -35,10 +36,10 @@ personal weblogs to large community-driven websites.  Drupal is highly
 configurable, skinnable, and secure.
 
 %prep
-
-%setup -q -n %{name}-%{version}.%{taglevel}
+%setup -q -n %{name}-%{version}.%{taglevel} -a 3
 
 %build
+mv taxonomy_block modules
 
 %install
 rm -rf %{buildroot}