VirtualGL 2.3-1

1 files changed, 66 insertions, 164 deletions

diff --git a/VirtualGL/VirtualGL.spec b/VirtualGL/VirtualGL.spec
index f638b6b..4e5d2f1 100644
--- a/VirtualGL/VirtualGL.spec
+++ b/VirtualGL/VirtualGL.spec
@@ -1,32 +1,20 @@
-# This is a hack to prevent the RPM from depending on libGLcore.so.1 and
-# libnvidia-tls.so.1 if it was built on a system that has the NVidia
-# drivers installed.  The custom find-requires script is created during
-# install and removed during clean
-
-%define __find_requires %{_tmppath}/%{name}-%{version}-%{release}-find-requires
-
-# Prefix in which essential server/client binaries should be stored
-%define sysprefix /usr
-
-# Prefix in which everything else (except docs) should be stored
-%define prefix /opt/VirtualGL
-
-%define usesysdir %(test ! "%{prefix}" = "%{sysprefix}" && echo 1 || echo 0)
-
-%define docsymlink %(test ! "%{prefix}" = "`dirname %{_defaultdocdir}`" -a 1 = 1 && echo 1 || echo 0)
-
-Summary: A toolkit for displaying OpenGL applications to thin clients
-Name: VirtualGL
-Version: 2.3
-Vendor: The VirtualGL Project
-URL: http://www.virtualgl.org
-Group: Applications/Graphics
-Source0: http://prdownloads.sourceforge.net/virtualgl/VirtualGL-%{version}.tar.gz
-Release: 20111213
-License: wxWindows Library License v3.1
-BuildRoot: %{_tmppath}/%{name}-buildroot-%{version}-%{release}
-Prereq: /sbin/ldconfig
-Provides: %{name} = %{version}-%{release}
+Summary:        A toolkit for displaying OpenGL applications to thin clients
+Name:           VirtualGL
+Version:        2.3
+Vendor:         The VirtualGL Project
+URL:            http://www.virtualgl.org/
+Group:          Applications/System
+Source0:        http://prdownloads.sourceforge.net/virtualgl/VirtualGL-%{version}.tar.gz
+Release:        1%{?dist}
+License:        wxWidgets
+BuildRequires:  cmake
+BuildRequires:  openssl-devel
+BuildRequires:  turbojpeg-devel
+BuildRequires:  libX11-devel
+BuildRequires:  libXext-devel
+BuildRequires:  mesa-libGL-devel
+BuildRequires:  mesa-libGLU-devel
+BuildRequires:  libXv-devel
 
 %description
 VirtualGL is a toolkit that allows most Unix/Linux OpenGL applications to be
@@ -57,152 +45,66 @@ Visualization" (Stegmaier, Magallon, Ertl 2002) and "A Framework for
 Interactive Hardware Accelerated Remote 3D-Visualization" (Engel, Sommer,
 Ertl 2000.)
 
+%package devel
+Summary:    Development headers and libraries for VirtualGL
+BuildArch:  noarch
+Requires:   %{name}%{?_isa} = %{version}-%{release}
+Requires:   openssl-devel
+Requires:   turbojpeg-devel
+Requires:   libX11-devel
+Requires:   libXext-devel
+Requires:   mesa-libGL-devel
+Requires:   mesa-libGLU-devel
+Requires:   libXv-devel
+
+%description devel
+Development headers and libraries for VirtualGL.
+
 %prep
 %setup -q
 
 %build
-cmake -G"Unix Makefiles" -DCMAKE_INSTALL_PREFIX=%{prefix} -DVGL_USEXV=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_VERBOSE_MAKEFILE=1 .
-make
+%cmake -DTJPEG_INCLUDE_DIR=%{_includedir} \
+       -DTJPEG_LIBRARY=%{_libdir}/libturbojpeg.so \
+       -DVGL_USESSL=ON -DVGL_LIBDIR=%{_libdir} \
+       -DVGL_DOCDIR=%{_docdir}/%{name}-%{version}/ \
+       -DVGL_FAKELIBDIR=%{_libdir}/fakelib/ .
+make %{?_smp_mflags}
 
 %install
-
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
+# renamed from glxinfo which provided by glx-utils
+mv $RPM_BUILD_ROOT%{_bindir}/{,v}glxinfo
 
-%ifarch x86_64
-mv $RPM_BUILD_ROOT/%{prefix}/bin/glxspheres $RPM_BUILD_ROOT/%{prefix}/bin/glxspheres64
-%endif
-
-%if %{usesysdir}
-
-mkdir -p $RPM_BUILD_ROOT/%{sysprefix}/bin
-%ifarch x86_64
-mv $RPM_BUILD_ROOT/%{prefix}/lib $RPM_BUILD_ROOT/%{sysprefix}/lib64
-%else
-mv $RPM_BUILD_ROOT/%{prefix}/lib $RPM_BUILD_ROOT/%{sysprefix}/lib
-%endif
-
-for i in vglclient vglconfig vglconnect vglgenkey vgllogin vglrun vglserver_config; do
-	mv $RPM_BUILD_ROOT/%{prefix}/bin/$i $RPM_BUILD_ROOT/%{sysprefix}/bin/
-done
-
-mkdir -p $RPM_BUILD_ROOT/%{sysprefix}/include
-for i in rr.h rrtransport.h; do
-	mv $RPM_BUILD_ROOT/%{prefix}/include/$i $RPM_BUILD_ROOT/%{sysprefix}/include/
-	ln -fs %{sysprefix}/include/$i $RPM_BUILD_ROOT/%{prefix}/include/$i
-done
-
-pushd $RPM_BUILD_ROOT/%{sysprefix}/bin
-for i in *; do
-	ln -fs %{sysprefix}/bin/$i $RPM_BUILD_ROOT/%{prefix}/bin/; done
-popd
+%post -p /sbin/ldconfig
 
-%else
-
-%ifarch x86_64
-mv $RPM_BUILD_ROOT/%{prefix}/lib $RPM_BUILD_ROOT/%{prefix}/lib64
-%endif
-
-%endif
-
-%ifarch x86_64
-rm $RPM_BUILD_ROOT/%{prefix}/fakelib/64/libGL.so
-ln -fs %{sysprefix}/lib64/librrfaker.so $RPM_BUILD_ROOT/%{prefix}/fakelib/64/libGL.so
-%else
-rm $RPM_BUILD_ROOT/%{prefix}/fakelib/libGL.so
-ln -fs %{sysprefix}/lib/librrfaker.so $RPM_BUILD_ROOT/%{prefix}/fakelib/libGL.so
-%endif
-
-mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}
-mv $RPM_BUILD_ROOT/%{prefix}/doc $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}
-%if %{docsymlink}
-ln -fs %{_defaultdocdir}/%{name}-%{version} $RPM_BUILD_ROOT/%{prefix}/doc
-%endif
-
-echo '/usr/lib/rpm/find-requires|grep -v libGLcore|grep -v libnvidia-tls' >%{_tmppath}/%{name}-%{version}-%{release}-find-requires
-chmod 755 %{_tmppath}/%{name}-%{version}-%{release}-find-requires
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-rm %{_tmppath}/%{name}-%{version}-%{release}-find-requires
-
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files -n %{name}
-%defattr(-,root,root)
-%dir %{_defaultdocdir}/%{name}-%{version}
-%doc %{_defaultdocdir}/%{name}-%{version}/*
-
-%dir %{prefix}
-
-%dir %{prefix}/bin
-%{prefix}/bin/tcbench
-%{prefix}/bin/nettest
-%{prefix}/bin/cpustat
-%{prefix}/bin/glxinfo
-%{prefix}/bin/vglclient
-%{prefix}/bin/vglconfig
-%{prefix}/bin/vglconnect
-%{prefix}/bin/vglgenkey
-%{prefix}/bin/vgllogin
-%{prefix}/bin/vglserver_config
-%{prefix}/bin/vglrun
-%ifarch x86_64
- %{prefix}/bin/glxspheres64
-%else
- %{prefix}/bin/glxspheres
-%endif
-%if %{usesysdir}
- %{sysprefix}/bin/vglclient
- %{sysprefix}/bin/vglconfig
- %{sysprefix}/bin/vglconnect
- %{sysprefix}/bin/vgllogin
- %{sysprefix}/bin/vglrun
- %{sysprefix}/bin/vglgenkey
- %{sysprefix}/bin/vglserver_config
-%endif
-
-%if %{docsymlink}
- %{prefix}/doc
-%endif
-
-%dir %{prefix}/fakelib
-%ifarch x86_64
- %dir %{prefix}/fakelib/64
- %{prefix}/fakelib/64/libGL.so
-%else
- %{prefix}/fakelib/libGL.so
-%endif
-
-%dir %{prefix}/include
-%{prefix}/include/rrtransport.h
-%{prefix}/include/rr.h
-%if %{usesysdir}
- %{sysprefix}/include/rrtransport.h
- %{sysprefix}/include/rr.h
-%endif
+%{_docdir}/%{name}-%{version}/
+%{_bindir}/tcbench
+%{_bindir}/nettest
+%{_bindir}/cpustat
+# renamed from glxinfo which provided by glx-utils
+%{_bindir}/vglxinfo
+%{_bindir}/vglclient
+%{_bindir}/vglconfig
+%{_bindir}/vglconnect
+%{_bindir}/vglgenkey
+%{_bindir}/vgllogin
+%{_bindir}/vglserver_config
+%{_bindir}/vglrun
+%{_bindir}/glxspheres
+%{_libdir}/libdlfaker.so
+%{_libdir}/libgefaker.so
+%{_libdir}/librrfaker.so
+%{_libdir}/fakelib/
+
+%files devel
+%{_includedir}/rrtransport.h
+%{_includedir}/rr.h
 
-%ifarch x86_64
- %{sysprefix}/lib64/librrfaker.so
- %{sysprefix}/lib64/libdlfaker.so
- %{sysprefix}/lib64/libgefaker.so
- %if %{usesysdir}
- %else
-  %dir %{prefix}/lib64
- %endif
-%else
- %{sysprefix}/lib/librrfaker.so
- %{sysprefix}/lib/libdlfaker.so
- %{sysprefix}/lib/libgefaker.so
- %if %{usesysdir}
- %else
-  %dir %{prefix}/lib
- %endif
-%endif
 
 %changelog
+* Thu Feb 16 2012 Robin Lee <cheeselee@fedoraproject.org> - 2.3-1
+- Specfile based on upstream and Mandriva specfiles