X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drupal.spec;h=14dbf4f5a4827de3eb126d39179e2d751a64d2fa;hb=a37c064ba5fa0dc854783296778dcd846c5982d2;hp=d0f1897027240c0d32d3e4de6a83af3b77742a3b;hpb=918b6e946618ce3906d5a9ba76b3aeaea1216c09;p=drupal.git

diff --git a/drupal.spec b/drupal.spec
index d0f1897..14dbf4f 100644
--- a/drupal.spec
+++ b/drupal.spec
@@ -4,7 +4,8 @@
 
 %define name drupal
 %define version 4.7
-%define taglevel 11
+%define taglevel 13
+%define minorversion 11
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -20,9 +21,10 @@ Summary: An open-source content-management platform
 Group: Applications/Publishing
 License: GPLv2+        
 URL: http://www.drupal.org
-Source0: http://ftp.osuosl.org/pub/drupal/files/projects/%{name}-%{version}.%{taglevel}.tar.gz
+Source0: http://ftp.osuosl.org/pub/drupal/files/projects/%{name}-%{version}.%{minorversion}.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 +37,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}.%{minorversion} -a 3
 
 %build
+mv taxonomy_block modules
 
 %install
 rm -rf %{buildroot}
@@ -67,5 +69,11 @@ rm -rf %{buildroot}
 %dir %attr(775,root,apache) %{drupaldir}/files
 
 %changelog
+* Thu Jun 11 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - drupal-4.7-13
+- fix build; drupal version not linked to this tagleve;l
+
+* Wed Jun 10 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - drupal-4.7-12
+- add taxonomy_block to default install
+
 * Fri Jan 09 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> -
 - plain drupal 4.7.11