can't do noarch subpkg's on el5

Merge remote branch 'origin/el6/master' into el5/master
Conflicts: virtuoso-opensource.spec
2011-01-14 07:44:26 -06:00 · 2011-01-14 07:29:25 -06:00 · 2011-01-14 07:27:44 -06:00 · 2011-01-14 07:09:29 -06:00 · 2010-07-29 15:05:37 +00:00 · 2010-07-22 14:58:01 +00:00
3 changed files with 16 additions and 11 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1 @@
-/virtuoso-opensource-6.1.2.tar.gz
-/virtuoso-opensource-6-20110105.tar.gz
+virtuoso-opensource-6.1.2.tar.gz
--- a/2
+++ b/2
@ -1 +1 @@
-7d406b41d0b3b4636d07b06d16331827  virtuoso-opensource-6-20110105.tar.gz
+0519e1f104428e0c8b25fad89e3c57ef  virtuoso-opensource-6.1.2.tar.gz
--- a/virtuoso-opensource.spec
+++ b/virtuoso-opensource.spec
@ -2,12 +2,12 @@
 # set to omit demos
 #define _disable_all_vads   --disable-all-vads

-%define pre rc3
-%define snap 20110105
+#define pre rc3
+#define snap 20110105

 Name:    virtuoso-opensource
-Version: 6.1.3
-Release: 0.1.%{pre}.%{snap}%{?dist}
+Version: 6.1.2
+Release: 3%{?dist}
 Summary: A high-performance object-relational SQL database

 Group:   Applications/Databases
@ -26,7 +26,6 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Patch51: virtuoso-opensource-6.1.0-external_iodbc.patch
 Patch52: virtuoso-opensource-6.1.0-nodemos_buildfix.patch

-BuildRequires: automake libtool
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: gperf
@ -42,6 +41,7 @@ BuildRequires: zlib-devel
 Provides: virtuoso = %{version}-%{release}

 %if 0%{?_disable_all_vads:1}
+BuildRequires: automake libtool
 Obsoletes: virtuoso-opensource-apps < %{version}-%{release} 
 Obsoletes: virtuoso-opensource-conductor < %{version}-%{release} 
 Obsoletes: virtuoso-opensource-doc < %{version}-%{release} 
@ -64,7 +64,9 @@ Requires: %{name} = %{version}-%{release}
 Summary: Server pages 
 Group:   Applications/Databases
 Requires: %{name} = %{version}-%{release}
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
 BuildArch: noarch
+%endif
 %description conductor 
 %{summary}.

@ -72,7 +74,9 @@ BuildArch: noarch
 Summary: Documentation 
 Group:   Documentation 
 Requires: %{name} = %{version}-%{release}
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
 BuildArch: noarch
+%endif
 %description doc 
 %{summary}.

@ -88,9 +92,11 @@ Requires: %{name} = %{version}-%{release}
 %setup -q -n virtuoso-opensource-%{!?snap:%{version}}%{?snap:6-%{snap}}

 #patch51 -p1 -b .external_iodbc
-%patch52 -p1 -b .nodemos_buildfix

+%if 0%{?_disable_all_vads:1}
+%patch52 -p1 -b .nodemos_buildfix
 ./autogen.sh
+%endif

 find -name "*.jar"
 find -name "*.jar" -delete
@ -196,8 +202,8 @@ rm -rf %{buildroot}


 %changelog
-* Thu Jan 06 2011 Rex Dieter <rdieter@fedoraproject.org> 6.1.3-0.1.rc3.20110105
- virtuoso-opensource-6-20110105 snapshot
+* Thu Jan 13 2011 Rex Dieter <rdieter@fedoraproject.org> 6.1.2-3 
+- don't autogen.sh things by default

 * Thu Oct 21 2010 Pierre-Yves Chibon <pingou@pingoured.fr> 6.1.2-2
 - Enable creation subpackage -conductor
Author	SHA1	Message	Date
Rex Dieter	2e4a26e0e5	can't do noarch subpkg's on el5	2011-01-14 07:44:26 -06:00
Rex Dieter	841e6779aa	Merge remote branch 'origin/el6/master' into el5/master Conflicts: virtuoso-opensource.spec	2011-01-14 07:29:25 -06:00
Rex Dieter	2cca2e8f1f	Merge remote branch 'origin/f14/master' into el6/master Conflicts: virtuoso-opensource-6.1.0-external_iodbc.patch virtuoso-opensource.spec	2011-01-14 07:27:44 -06:00
Rex Dieter	bf421228da	- don't autogen.sh things by default	2011-01-14 07:09:29 -06:00
Fedora Release Engineering	262e67f855	dist-git conversion	2010-07-29 15:05:37 +00:00
Rex Dieter	09ea50eb63	- virtuoso-opensource-6.1.2	2010-07-22 14:58:01 +00:00
Rex Dieter	85b6ac3d3e	- virtuoso-opensource-6.1.1 - Obsoletes: -doc	2010-05-10 20:14:10 +00:00
Rex Dieter	f570e73e21	- fix Obsoletes: -apps,-conductor	2010-02-10 00:51:58 +00:00
Rex Dieter	f23a536905	- virtuoso-opensource-6.1.0 - build only what we need for nepomuk, Obsoletes: -apps,-conductor	2010-02-04 18:23:53 +00:00
Bill Nottingham	7a82c5aae2	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:14:40 +00:00
Rex Dieter	f1d88a0030	import	2009-10-20 14:34:41 +00:00
Rex Dieter	12ec77ad12	- virtuoso-opensource-5.0.12	2009-10-20 14:29:17 +00:00
Jesse Keating	dda6e6c92a	Initialize branch F-12 for virtuoso-opensource	2009-09-29 07:16:45 +00:00