Request 1940 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 1940 (accepted)

No description set

Created by awissu over 9 years ago
In state accepted
Package maintainer: awissu

Submit GLStats

Submit package home:awissu:equalizer / GLStats to package Multimedia / GLStats

GLStats.changes Changed

GLStats.spec Changed

@@ -10,65 +10,103 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.links2linux.org/
 #
 
-%define soname 0
-%define libsuffix %(echo %{_lib}|%__sed 's/^lib//')
 Name:           GLStats
-Version:        0.1.0
+Version:        0.3.1
 Release:        0
 Summary:        Generic OpenGL overlay statistics renderer
 Group:          Development/Libraries/C and C++
 License:        LGPL-2.1
-URL:            https://github.com/Eyescale/GLStats
-Source0:        %{name}-%{version}.tar.gz
-# PATCH-FIX-OPENSUSE fix-64bit.diff avvissu@yandex.ru -- Patch to fix the libdir on 64-bit architecture
-Patch0:         fix-64bit.diff
-BuildRequires:  gcc-c++ cmake pkgconfig 
-BuildRequires:  libX11-devel Mesa-libGL-devel
-BuildRequires:  Lunchbox-devel
+URL:            http://www.equalizergraphics.com/
+Source0:        https://github.com/Eyescale/GLStats/archive/0.3.1.tar.gz#/%{name}-%{version}.tar.gz
+Source1:        https://github.com/Eyescale/CMake/archive/master.tar.gz#/CMake-common_git20150515.tar.gz
+# PATCH-FIX-OPENSUSE include.patch avvissu@yandex.ru -- Remove Buildyard project
+Patch0:         GLStats-0.3.1_include.patch
+# PATCH-FIX-OPENSUSE test.patch avvissu@yandex.ru -- Fix CMake Error: The test doesn't work
+Patch1:         GLStats-0.3.1_test.patch
+# PATCH-FIX-UPSTREAM doxygen.patch avvissu@yandex.ru -- Fix build error: need administrative privileges
+Patch2:         CMake_doxygen.patch
+BuildRequires:  cmake
+BuildRequires:  gcc-c++
+BuildRequires:  pkgconfig
+BuildRequires:  doxygen
+BuildRequires:  fdupes
+BuildRequires:  python-devel
+BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(Lunchbox)
 
 %description
 No additional information:
 ...
 GLStats Runtime Libraries
 
-%package devel
+%package        devel
 Summary:        Development files for OpenGL overlay statistics renderer
 Group:          Development/Libraries/C and C++
 License:        LGPL-2.1
+Requires:       pkgconfig(Lunchbox)
 
-%description devel
-This package contains, header files, and libraries needed to
-develop application that use %{name}
+%description    devel
+Generic OpenGL overlay statistics renderer.
+...
+This package contains header files and libraries needed to develop 
+application that use %{name}.
+
+%package        doc
+Summary:        Documentation for %{name}
+Group:          Documentation/HTML
+BuildArch:      noarch
+
+%description 	doc
+Generic OpenGL overlay statistics renderer.
+...
+API Documentation for %{name}.
 
 %prep
-%setup 
-%patch0
+%setup -q -a1
+mv CMake-common* CMake/common
+%patch0 -p1
+%patch1 -p1
+pushd CMake/common
+%patch2 -p1
+popd
+
+# Do not compile in DATE and TIME
+sed -i '/^HTML_TIMESTAMP/s/YES/NO/' $(grep -rl 'HTML_TIMESTAMP')
 
 %build
-mkdir build
-pushd build
-cmake -DLIB_SUFFIX="%{libsuffix}" ..
-make 
-popd
+%cmake \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_SKIP_RPATH:BOOL=OFF
+
+make %{?_smp_mflags}
+make %{?_smp_mflags} doxygen
 
 %install
-pushd build
-%makeinstall
-popd
-install -m 755 -d %{buildroot}%{_docdir}/%{name}
-install -p -m 644 -t %{buildroot}%{_docdir}/%{name} doc/LGPL.txt
+%make_install -C build
+
+mkdir -p %{buildroot}%{_docdir}
+mv %{buildroot}{%{_datadir}/%{name}/doc,%{_docdir}/%{name}}
+
+%fdupes -s %{buildroot}%{_docdir}
+
+%check
+#sed -i '/ctest/s|$bin/ctest$|\1 -V|' build/Makefile
+#make test -C build
 
 %files devel
 %defattr(-, root, root)
-%{_docdir}/%{name}
 %{_includedir}/%{name}
 %{_libdir}/lib%{name}.a
 %{_libdir}/pkgconfig/%{name}.pc
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/CMake
-%{_datadir}/%{name}/CMake/*.cmake
+%{_datadir}/%{name}
+
+%files doc
+%defattr(-,root,root)
+%doc LICENSE* README* doc/LGPL*
+%{_docdir}/%{name}
 
 %changelog
\ No newline at end of file

CMake_doxygen.patch Added

GLStats-0.3.1_include.patch Added

GLStats-0.3.1_test.patch Added

fix-64bit.diff Deleted

CMake-common_git20150515.tar.gz Added

GLStats-0.1.0.tar.gz -> GLStats-0.3.1.tar.gz Changed

Build Results
RPM Lint

Refresh

Comments for request 1940 0

Request History

awissu created request over 9 years ago

awissu accepted request over 9 years ago

Please add a comment