From 75aa305437f9878a34fed420936a1335d86b1d46 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 15 Feb 2011 13:59:17 -0600 Subject: [PATCH 1/4] Revert "- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild" This reverts commit 90376ab656913de1748fcb06a499984f94e924f7. --- virtuoso-opensource.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 838288c..4e08375 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -7,7 +7,7 @@ Name: virtuoso-opensource Version: 6.1.3 -Release: 0.3.%{pre}.%{snap}%{?dist} +Release: 0.2.%{pre}.%{snap}%{?dist} Summary: A high-performance object-relational SQL database Group: Applications/Databases @@ -198,9 +198,6 @@ rm -rf %{buildroot} %changelog -* Mon Feb 07 2011 Fedora Release Engineering - 6.1.3-0.3.rc3.20110105 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - * Thu Jan 13 2011 Rex Dieter 6.1.3-0.2.rc3.20110105 - don't autogen.sh things by default From 02d25e6cc49d35a44ded3a152484914635b1971e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 15 Feb 2011 13:59:22 -0600 Subject: [PATCH 2/4] Revert "- don't autogen.sh things by default" This reverts commit 2495aeb8abb41997ed7b4a0444e791e279227e99. --- virtuoso-opensource.spec | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 4e08375..3f368f1 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -7,7 +7,7 @@ Name: virtuoso-opensource Version: 6.1.3 -Release: 0.2.%{pre}.%{snap}%{?dist} +Release: 0.1.%{pre}.%{snap}%{?dist} Summary: A high-performance object-relational SQL database Group: Applications/Databases @@ -26,6 +26,7 @@ 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 @@ -41,7 +42,6 @@ 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} @@ -88,11 +88,9 @@ Requires: %{name} = %{version}-%{release} %setup -q -n virtuoso-opensource-%{!?snap:%{version}}%{?snap:6-%{snap}} #patch51 -p1 -b .external_iodbc - -%if 0%{?_disable_all_vads:1} %patch52 -p1 -b .nodemos_buildfix + ./autogen.sh -%endif find -name "*.jar" find -name "*.jar" -delete @@ -198,9 +196,6 @@ rm -rf %{buildroot} %changelog -* Thu Jan 13 2011 Rex Dieter 6.1.3-0.2.rc3.20110105 -- don't autogen.sh things by default - * Thu Jan 06 2011 Rex Dieter 6.1.3-0.1.rc3.20110105 - virtuoso-opensource-6-20110105 snapshot From 98556c4311da49e5b3197a1fc7faafe1e907c3a7 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 15 Feb 2011 13:59:28 -0600 Subject: [PATCH 3/4] Revert "- virtuoso-opensource-6-20110105 snapshot" This reverts commit cf240977e9b2a31d5e41443f78b92025d75ea43a. --- .gitignore | 3 +-- sources | 2 +- virtuoso-opensource.spec | 11 ++++------- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 0e05b9f..b1b4513 100644 --- 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 diff --git a/sources b/sources index c88f734..2eaf4e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d406b41d0b3b4636d07b06d16331827 virtuoso-opensource-6-20110105.tar.gz +0519e1f104428e0c8b25fad89e3c57ef virtuoso-opensource-6.1.2.tar.gz diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 3f368f1..bc7e90b 100644 --- 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: 2%{?dist} Summary: A high-performance object-relational SQL database Group: Applications/Databases @@ -196,9 +196,6 @@ rm -rf %{buildroot} %changelog -* Thu Jan 06 2011 Rex Dieter 6.1.3-0.1.rc3.20110105 -- virtuoso-opensource-6-20110105 snapshot - * Thu Oct 21 2010 Pierre-Yves Chibon 6.1.2-2 - Enable creation subpackage -conductor - Remove all .jar from sources before building From 9fc68b1f97b63de55f77748fea8e812ed852168b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 15 Feb 2011 14:05:07 -0600 Subject: [PATCH 4/4] f15 rebuild epoch++, downgrade from broken 6.1.3 snapshot --- virtuoso-opensource.spec | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index bc7e90b..c746b35 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -6,8 +6,9 @@ #define snap 20110105 Name: virtuoso-opensource +Epoch: 1 Version: 6.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A high-performance object-relational SQL database Group: Applications/Databases @@ -42,9 +43,9 @@ BuildRequires: zlib-devel Provides: virtuoso = %{version}-%{release} %if 0%{?_disable_all_vads:1} -Obsoletes: virtuoso-opensource-apps < %{version}-%{release} -Obsoletes: virtuoso-opensource-conductor < %{version}-%{release} -Obsoletes: virtuoso-opensource-doc < %{version}-%{release} +Obsoletes: virtuoso-opensource-apps < 6.1.1-1 +Obsoletes: virtuoso-opensource-conductor < 6.1.1-1 +Obsoletes: virtuoso-opensource-doc < 6.1.1-1 %endif @@ -56,14 +57,14 @@ functionality. %package apps Summary: Applications Group: Applications/Databases -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description apps %{summary}. %package conductor Summary: Server pages Group: Applications/Databases -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} BuildArch: noarch %description conductor %{summary}. @@ -71,7 +72,7 @@ BuildArch: noarch %package doc Summary: Documentation Group: Documentation -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} BuildArch: noarch %description doc %{summary}. @@ -79,7 +80,7 @@ BuildArch: noarch %package utils Summary: Utilities Group: Applications/Databases -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description utils %{summary}. @@ -196,6 +197,10 @@ rm -rf %{buildroot} %changelog +* Tue Feb 15 2011 Rex Dieter 1:6.1.2-3 +- f15 rebuild +- epoch++, downgrade from broken 6.1.3 snapshot + * Thu Oct 21 2010 Pierre-Yves Chibon 6.1.2-2 - Enable creation subpackage -conductor - Remove all .jar from sources before building