diff --git a/0001-Fixed-a-compilation-error-in-YTableCell-with-GCC-6-b.patch b/0001-Fixed-a-compilation-error-in-YTableCell-with-GCC-6-b.patch deleted file mode 100644 index 0e3be7f..0000000 --- a/0001-Fixed-a-compilation-error-in-YTableCell-with-GCC-6-b.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d95556cf14bc6dfc9601da8c099ba12899b34dbc Mon Sep 17 00:00:00 2001 -From: Martin Vidner -Date: Fri, 29 Jan 2016 14:00:17 +0100 -Subject: [PATCH] Fixed a compilation error in YTableCell with GCC 6 - (bsc#964144). - -It enables a previously inactive consistency check. -I have checked the known callers and they all seem to pass this check. ---- - src/YTableItem.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/YTableItem.cc b/src/YTableItem.cc -index 75923f1..40e7d4f 100644 ---- a/src/YTableItem.cc -+++ b/src/YTableItem.cc -@@ -172,7 +172,7 @@ void YTableCell::reparent( YTableItem * parent, int column ) - { - YUI_CHECK_PTR( parent ); - -- if ( _parent && _parent != parent && column != column ) -+ if ( _parent && _parent != parent && _column != column ) - YUI_THROW( YUIException( std::string( "Cannot reparent YTableCell \"" ) - + _label - + "to different parent." ) ); --- -2.5.0 - diff --git a/libyui.spec b/libyui.spec index 9465941..bbadb1b 100644 --- a/libyui.spec +++ b/libyui.spec @@ -80,11 +80,11 @@ brief examples how to build a UI using %{name}. %build %{__mkdir} -p %{_cmake_build_subdir} pushd %{_cmake_build_subdir} -%cmake \ - -DYPREFIX=%{_prefix} \ - -DLIB_DIR=%{_libdir} \ - -DCMAKE_BUILD_TYPE=RELEASE \ - -DRESPECT_FLAGS=ON \ +%cmake \ + -DYPREFIX=%{_prefix} \ + -DLIB_DIR=%{_libdir} \ + -DCMAKE_BUILD_TYPE=RELEASE \ + -DRESPECT_FLAGS=ON \ .. %{__make} %{?_smp_mflags} @@ -94,13 +94,13 @@ popd %install pushd %{_cmake_build_subdir} -%{__mkdir} -p %{buildroot}%{_libdir}/%{libsuffix} \ +%{__mkdir} -p %{buildroot}%{_libdir}/%{libsuffix} \ %{buildroot}%{_datadir}/%{name}/theme %make_install # Delete obsolete files. -%{__rm} -rf %{buildroot}%{_defaultdocdir} \ +%{__rm} -rf %{buildroot}%{_defaultdocdir} \ ../examples/CMake* doc/html/*.m* # Hard-link documentation. @@ -108,7 +108,8 @@ pushd %{_cmake_build_subdir} # Install documentation. %{__mkdir} -p %{buildroot}%{?_pkgdocdir} -%{__cp} -a package/libyui.changes ../examples/ doc/html/ \ +%{__cp} -a ../package/libyui.changes \ + ../examples/ doc/html/ \ %{buildroot}%{?_pkgdocdir} popd