Packman Build Service PMBS

Changes of Revision 16

x265.changes Changed

x265.spec Changed

@@ -14,13 +14,7 @@
 Patch0:         arm.patch
 BuildRequires:  gcc gcc-c++
 BuildRequires:  cmake >= 2.8.8
-# for openSUSE 13.1 only libnuma-devel = 2.0.8 is available, but version 2.0.9 or higher is required
-# build against version 2.0.8 failes with "error: 'numa_bitmask_weight' was not declared in this scope"
-%if ! ( 0%{?suse_version} == 1310 )
-%ifarch x86_64
 BuildRequires:  libnuma-devel >= 2.0.9
-%endif
-%endif
 BuildRequires:  pkg-config
 BuildRequires:  yasm >= 1.2.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -50,32 +44,28 @@
 streams. 
 
 %prep
-%setup -q -n x265_%{version}
+%setup -q -n %{name}_%{version}
 %patch0 -p1
 
-%define FAKE_BUILDDATE %(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
 sed -i -e "s/0.0/%{soname}.0/g" source/cmake/version.cmake
 
 
 %build
-export CXXFLAGS="%{optflags}"
-export CFLAGS="%{optflags}"
-
-cd build/linux
-cmake  -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-       -DLIB_INSTALL_DIR=%{_lib} \
-       -DENABLE_TESTS=ON \
-       -G "Unix Makefiles" \
-       ../../source
-
-make %{?_smp_mflags} VERBOSE=1
+%if 0%{?suse_version} < 1330
+cd source
+%else
+%define __builddir ./source/build
+%define __sourcedir ./source
+%endif
+%cmake -DENABLE_TESTS=ON
+make %{?_smp_mflags}
 
 %install
-cd build/linux
-%makeinstall
-
+%if 0%{?suse_version} < 1330
+cd source
+%endif
+%cmake_install
 rm -f %{buildroot}%{_libdir}/%{libname}.a
-
 echo "%{libname}-%{soname}" > %{_sourcedir}/baselibs.conf
 
 %post -n %{libsoname} -p /sbin/ldconfig