rpms/virtuoso-opensource/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 virtuoso-opensource.spec, 1.12, 1.13

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/virtuoso-opensource/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv874

Modified Files:
	.cvsignore sources virtuoso-opensource.spec 
Log Message:
* Mon May 10 2010 Rex Dieter <rdieter at fedoraproject.org> 6.1.1-1
- virtuoso-opensource-6.1.1
- Obsoletes: -doc



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	4 Feb 2010 13:27:45 -0000	1.5
+++ .cvsignore	10 May 2010 13:28:35 -0000	1.6
@@ -1 +1 @@
-virtuoso-opensource-6.1.0.tar.gz
+virtuoso-opensource-6.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	4 Feb 2010 13:27:46 -0000	1.5
+++ sources	10 May 2010 13:28:36 -0000	1.6
@@ -1 +1 @@
-49135390d27ab3e445f5e9481ab677bb  virtuoso-opensource-6.1.0.tar.gz
+0695bffacf78e53733c27e96c9d7f9e7  virtuoso-opensource-6.1.1.tar.gz


Index: virtuoso-opensource.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/devel/virtuoso-opensource.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- virtuoso-opensource.spec	9 Feb 2010 21:31:28 -0000	1.12
+++ virtuoso-opensource.spec	10 May 2010 13:28:36 -0000	1.13
@@ -3,8 +3,8 @@
 %define _disable_all_vads   --disable-all-vads
 
 Name:	 virtuoso-opensource
-Version: 6.1.0
-Release: 2%{?dist}
+Version: 6.1.1
+Release: 1%{?dist}
 Summary: A high-performance object-relational SQL database
 
 Group:   Applications/Databases
@@ -16,8 +16,6 @@ Source0: http://downloads.sourceforge.ne
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 ## Upstreamable patches
-# fix build with ossl-1.0
-Patch50: virtuoso-opensource-5.0.11-openssl.patch
 # based on http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/virtuoso-opensource/current/SOURCES/virtuoso-opensource-6.1.0-extern-iodbc.patch
 Patch51: virtuoso-opensource-6.1.0-external_iodbc.patch
 Patch52: virtuoso-opensource-6.1.0-nodemos_buildfix.patch
@@ -40,6 +38,7 @@ Provides: virtuoso = %{version}-%{releas
 %if 0%{?_disable_all_vads:1}
 Obsoletes: virtuoso-opensource-apps < 6.1.0
 Obsoletes: virtuoso-opensource-conductor < 6.1.0
+Obsoletes: virtuoso-opensource-doc < 6.1.1
 %endif
 
 
@@ -59,9 +58,7 @@ Requires: %{name} = %{version}-%{release
 Summary: Server pages 
 Group:   Applications/Databases
 Requires: %{name} = %{version}-%{release}
-%if 0%{?fedora} > 9
 BuildArch: noarch
-%endif
 %description conductor 
 %{summary}.
 
@@ -69,9 +66,7 @@ BuildArch: noarch
 Summary: Documentation 
 Group:   Documentation 
 Requires: %{name} = %{version}-%{release}
-%if 0%{?fedora} > 9
 BuildArch: noarch
-%endif
 %description doc 
 %{summary}.
 
@@ -86,7 +81,6 @@ Requires: %{name} = %{version}-%{release
 %prep
 %setup -q -n virtuoso-opensource%{!?snap:-%{version}}%{?snap:-%{snap}}
 
-%patch50 -p1 -b .openssl
 %patch51 -p1 -b .external_iodbc
 %patch52 -p1 -b .nodemos_buildfix
 
@@ -133,7 +127,11 @@ mv %{buildroot}%{_bindir}/{inifile,isql,
 rm -vf %{buildroot}%{_bindir}/odbc_mail
 rm -vf %{buildroot}%{_libdir}/*.{la,a}
 rm -vf %{buildroot}%{_libdir}/virtuoso/hosting/*.la
-rm -vf %{buildroot}%{_libdir}/{jdbc-?.?,jena,sesame}/*.jar
+%if 0%{?_disable_all_vads:1}
+rm -rvf %{buildroot}%{_docdir}/virtuoso/
+rm -rvf %{buildroot}%{_libdir}/sesame/
+rm -vf  %{buildroot}%{_libdir}/{hibernate,jdbc-?.?,jena,sesame}/*.jar
+%endif
 
 
 %check
@@ -147,7 +145,7 @@ rm -rf %{buildroot} 
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING LICENSE
+%doc AUTHORS ChangeLog COPYING CREDITS LICENSE
 %dir %{_sysconfdir}/virtuoso/
 %config(noreplace) %{_sysconfdir}/virtuoso/virtuoso.ini
 %{_bindir}/virtuoso-t
@@ -170,11 +168,11 @@ rm -rf %{buildroot} 
 %defattr(-,root,root,-)
 %{_datadir}/virtuoso/vad/conductor_dav.vad
 %{_var}/lib/virtuoso/vsp/
-%endif
 
 %files doc
 %defattr(-,root,root,-)
 %{_docdir}/virtuoso/
+%endif
 
 %files utils
 %defattr(-,root,root,-)
@@ -183,6 +181,10 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Mon May 10 2010 Rex Dieter <rdieter at fedoraproject.org> 6.1.1-1
+- virtuoso-opensource-6.1.1
+- Obsoletes: -doc
+
 * Tue Feb 09 2010 Rex Dieter <rdieter at fedoraproject.org> 6.1.0-2
 - fix Obsoletes: -apps,-conductor