X-Git-Url: http://git.pld-linux.org/?p=packages%2FGLM.git;a=blobdiff_plain;f=GLM.spec;h=336bba72b5c380b86c8630982c881be1dc4223a2;hp=11ce11c6b9ade7641f1cdc20a36493e85477e0d1;hb=HEAD;hpb=0979b4b3fd107f88bd6b3e0e062ed5397ddbbbb1

diff --git a/GLM.spec b/GLM.spec
index 11ce11c..07a6a5e 100644
--- a/GLM.spec
+++ b/GLM.spec
@@ -1,70 +1,86 @@
 #
 # Conditional build:
 %bcond_without	tests		# build without tests
-%bcond_with	p7zip		# plain p7zip (compatible with both rpm4/rpm5)
 #
 Summary:	OpenGL Mathematics (GLM) - C++ mathematics library for GLSL
 Summary(pl.UTF-8):	OpenGL Mathematics (GLM) - biblioteka matematyczna C++ dla GLSL
 Name:		GLM
-Version:	0.9.9.8
+Version:	1.0.1
 Release:	1
 License:	MIT
-Group:		Development/Libraries
+Group:		Libraries
 #Source0Download: https://github.com/g-truc/glm/releases
-Source0:	https://github.com/g-truc/glm/releases/download/%{version}/glm-%{version}.7z
-# Source0-md5:	c8342552801ebeb31497288192c4e793
+Source0:	https://github.com/g-truc/glm/archive/%{version}/glm-%{version}.tar.gz
+# Source0-md5:	f824ac50e16310a95279032f82cbd341
 Patch0:		x32.patch
 URL:		https://glm.g-truc.net/
-BuildRequires:	cmake >= 3.2
-%if %{with p7zip}
-BuildRequires:	p7zip
-%else
-BuildRequires:	p7zip-standalone
-BuildRequires:	rpm-build >= 5
-%endif
+BuildRequires:	cmake >= 3.6
+%{?with_tests:BuildRequires:	libstdc++-devel}
+BuildRequires:	rpmbuild(macros) >= 1.605
+Requires:	libstdc++-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 OpenGL Mathematics (GLM) is a C++ mathematics library for graphics
 software based on the OpenGL Shading Language (GLSL) specification.
 
-GLM is a header only library, there is nothing to build, just include
-it.
-
 %description -l pl.UTF-8
 OpenGL Mathematics (GLM) to biblioteka matematyczna C++ dla programów
 graficznych opartych na specyfikacji OpenGL Shading Language (GLSL).
 
+%package devel
+Summary:	OpenGL Mathematics (GLM) - C++ mathematics library for GLSL (header files)
+Summary(pl.UTF-8):	OpenGL Mathematics (GLM) - biblioteka matematyczna C++ dla GLSL (pliki nagłówkowe)
+Group:		Development/Libraries
+Requires:	libstdc++-devel
+# no base dependency - can be used as header-only library
+# not noarch due to paths in cmake configs
+
+%description devel
+OpenGL Mathematics (GLM) is a C++ mathematics library for graphics
+software based on the OpenGL Shading Language (GLSL) specification.
+
+%description devel -l pl.UTF-8
+OpenGL Mathematics (GLM) to biblioteka matematyczna C++ dla programów
+graficznych opartych na specyfikacji OpenGL Shading Language (GLSL).
+
 %prep
-%if %{with p7zip}
-%setup -q -c -T -n glm
-7z x %{SOURCE0} -o..
-%else
-%setup -q -n glm
-%endif
+%setup -q -n glm-%{version}
 %patch0 -p1
 
 %build
 mkdir build
 cd build
+# change CMAKE_INSTALL_DATAROOTDIR to arch-dependent (files contain arch-dependent libglm.so paths)
 %cmake .. \
+	-DCMAKE_INSTALL_DATAROOTDIR=%{_libdir}/cmake \
 	-DGLM_TEST_ENABLE:BOOL=%{!?with_tests:OFF}%{?with_tests:ON}
 
-%if %{with tests}
 %{__make}
+
+%if %{with tests}
 %{__make} test
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_includedir}
 
-cp -a glm $RPM_BUILD_ROOT%{_includedir}
+%{__make} -C build install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc manual.md readme.md
+%attr(755,root,root) %{_libdir}/libglm.so
+
+%files devel
+%defattr(644,root,root,755)
+%doc manual.md readme.md
 %{_includedir}/glm
+%{_libdir}/cmake/glm