- pl

- allow to build with plain p7zip, using rpm4/rpm5

diff --git a/GLM.spec b/GLM.spec
index 0a20528e476abf85691648bfdad25555153f7cf9..d28d41c17fa8b4e9677dfbd6ce75f6fd20b263fb 100644 (file)
--- a/GLM.spec
+++ b/GLM.spec
@@ -1,18 +1,25 @@
 #
 # Conditional build:
 %bcond_without tests           # build without tests
+%bcond_with    p7zip           # plain p7zip (compatible with both rpm4/rpm5)
 #
-Summary:       OpenGL Mathematics (GLM)
+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.4.4
 Release:       1
 License:       MIT
-Group:         Applications
+Group:         Development/Libraries
 Source0:       http://downloads.sourceforge.net/ogl-math/glm-%{version}.7z
 # Source0-md5: 1c5a626c025dff9664b08d8f39c7e11b
 URL:           http://glm.g-truc.net/
 BuildRequires: cmake
+%if %{with p7zip}
+BuildRequires: p7zip
+%else
 BuildRequires: p7zip-standalone
+BuildRequires: rpm-build >= 5
+%endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -22,24 +29,31 @@ 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).
+
 %prep
+%if %{with p7zip}
+%setup -q -c -T -n glm-%{version}
+7z x %{SOURCE0} -o..
+%else
 %setup -q -n glm-%{version}
+%endif
 
 %build
 mkdir build
 cd build
-%cmake \
-       ../ \
+%cmake .. \
        -DGLM_TEST_ENABLE:BOOL=%{!?with_tests:OFF}%{?with_tests:ON}
 
 %{?with_tests:%{__make}}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT
+#install -d $RPM_BUILD_ROOT
 
-cd build
-%{__make} install \
+%{__make} -C build install \
        DESTDIR=$RPM_BUILD_ROOT
 
 %clean