rpms/virtuoso-opensource/devel virtuoso-opensource.spec,1.11,1.12

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/virtuoso-opensource/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26869

Modified Files:
	virtuoso-opensource.spec 
Log Message:
* Tue Feb 09 2010 Rex Dieter <rdieter at fedoraproject.org> 6.1.0-2
- fix Obsoletes: -apps,-conductor



Index: virtuoso-opensource.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/devel/virtuoso-opensource.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- virtuoso-opensource.spec	4 Feb 2010 18:04:28 -0000	1.11
+++ virtuoso-opensource.spec	9 Feb 2010 21:31:28 -0000	1.12
@@ -4,7 +4,7 @@
 
 Name:	 virtuoso-opensource
 Version: 6.1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A high-performance object-relational SQL database
 
 Group:   Applications/Databases
@@ -38,8 +38,8 @@ BuildRequires: zlib-devel
 Provides: virtuoso = %{version}-%{release}
 
 %if 0%{?_disable_all_vads:1}
-Obsoletes: virtuoso-apps < 6.1.0
-Obsoletes: virtuoso-conductor < 6.1.0
+Obsoletes: virtuoso-opensource-apps < 6.1.0
+Obsoletes: virtuoso-opensource-conductor < 6.1.0
 %endif
 
 
@@ -136,6 +136,11 @@ rm -vf %{buildroot}%{_libdir}/virtuoso/h
 rm -vf %{buildroot}%{_libdir}/{jdbc-?.?,jena,sesame}/*.jar
 
 
+%check
+## these take a very long time
+#make check
+
+
 %clean
 rm -rf %{buildroot} 
 
@@ -178,6 +183,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Tue Feb 09 2010 Rex Dieter <rdieter at fedoraproject.org> 6.1.0-2
+- fix Obsoletes: -apps,-conductor
+
 * Thu Feb 04 2010 Rex Dieter <rdieter at fedoraproject.org> 6.1.0-1
 - virtuoso-opensource-6.1.0
 - build only what we need for nepomuk, Obsoletes: -apps,-conductor