new upstream version: obsoletes Patch0/1

modified Requires: yui_ui to to depend on {major_so_ver}
install lib*.so.`major_so_ver`* in main-pkg not lib*.so.*
add `-DRESPECT_FLAGS=ON`
removed macros from changelog
This commit is contained in:
Björn Esser 2013-05-16 14:08:58 +02:00
parent a77b0d2651
commit 9d3cd9aef7
5 changed files with 20 additions and 66 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/libyui-3.0.4-37f6bc2.tar.gz
/libyui-3.0.5-4d4bf96.tar.gz

View File

@ -1,6 +1,7 @@
%global commit 37f6bc2dbb1b525f7eabc71f43ae3949f0671be6
%global commit 4d4bf96e92e551a437257646f8987b0fe54c3d9f
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global libsuffix yui
%global major_so_ver 5
# This flag breaks the dependency loop between libyui and ui plugin packages
# to make it possible to (re)build plugin packages for libyui ABI changes.
@ -12,15 +13,11 @@
Name: lib%{libsuffix}
Version: 3.0.4
Release: 2%{?dist}
Version: 3.0.5
Release: 1%{?dist}
License: LGPLv2 or LGPLv3
Source0: https://github.com/%{name}/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
# both will be commited and merged with https://github.com/libyui/libyui/pull/47
Patch0: libyui_honor_compiler_flags.patch
Patch1: libyui_skip_doxygen_latex.patch
Group: System Environment/Libraries
BuildRequires: boost-devel
@ -31,7 +28,7 @@ BuildRequires: graphviz
BuildRequires: pkgconfig
%if !%{no_ui_dep}
Requires: yui-ui%{?_isa}
Requires: yui-ui%{?_isa} = %{major_so_ver}
%endif
URL: https://github.com/%{name}/%{name}/
@ -81,9 +78,6 @@ brief examples how to build a UI using %{name}.
%prep
%setup -q -n %{name}-%{commit}
%patch0
%patch1
./bootstrap.sh
%build
@ -97,7 +91,8 @@ cd build
-DDOC_SUBDIR=%{name}-%{version} \
-DINSTALL_DOCS=ON \
-DSKIP_LATEX=ON \
-DCMAKE_BUILD_TYPE=RELEASE
-DCMAKE_BUILD_TYPE=RELEASE \
-DRESPECT_FLAGS=ON
make %{?_smp_mflags}
make %{?_smp_mflags} docs
@ -123,7 +118,7 @@ install -pm0644 ../ChangeLog %{buildroot}/%{_defaultdocdir}/%{name}-%{version}
%files
%{_libdir}/lib*.so.*
%{_libdir}/lib*.so.%{major_so_ver}*
%dir %{_libdir}/%{libsuffix}
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/theme
@ -144,6 +139,13 @@ install -pm0644 ../ChangeLog %{buildroot}/%{_defaultdocdir}/%{name}-%{version}
%doc %{_defaultdocdir}/%{name}-%{version}/*/
%changelog
* Thu May 16 2013 Björn Esser <bjoern.esser@gmail.com> - 3.0.5-1
- new upstream version: obsoletes Patch0/1
- modified Requires: yui_ui to to depend on {major_so_ver}
- install lib*.so.`major_so_ver`* in main-pkg not lib*.so.*
- add `-DRESPECT_FLAGS=ON`
- removed macros from changelog
* Wed May 15 2013 Björn Esser <bjoern.esser@gmail.com> - 3.0.4-2
- readded Requires: yui_ui with conditional for ABI changes as proposed:
https://bugzilla.redhat.com/show_bug.cgi?id=959926#c9
@ -165,11 +167,11 @@ install -pm0644 ../ChangeLog %{buildroot}/%{_defaultdocdir}/%{name}-%{version}
https://fedoraproject.org/wiki/Packaging:Guidelines#Compiler_flags
- fixup as suggested in https://bugzilla.redhat.com/show_bug.cgi?id=959926#c4
- build a hardened version just in case
- add Requires: %{libsuffix}-ui, because %{name} without UI-plugins is as
- add Requires: yui-ui, because libyui without UI-plugins is as
useful as a car without gas and tires.
- add -devel Provides: %{libsuffix}-ui to provide a FAKE %{libsuffix}-ui to
- add -devel Provides: yui-ui to provide a FAKE yui-ui to
satisfy dependencies during rpmbuild of the UI-plugins and made sure this
is known by documenting this in %{name}-devel description.
is known by documenting this in libyui-devel description.
- add -devel Requires: cmake to solve the /usr/lib*/cmake/ ownership-problem,
which is needed for libyui*-builds anyways.

View File

@ -1,15 +0,0 @@
diff --git a/buildtools/LibyuiCommon.cmake b/buildtools/LibyuiCommon.cmake
index 726ab23..18453bc 100644
--- buildtools/LibyuiCommon.cmake
+++ buildtools/LibyuiCommon.cmake
@@ -109,8 +109,8 @@ MACRO( SET_BUILD_FLAGS ) # setup compiler-flags depending on CMAKE_BUILD_TYPE
SET( CMAKE_C_FLAGS_DEBUG "-O0 -g3" )
SET( CMAKE_CXX_FLAGS_MINSIZEREL "-Os" )
SET( CMAKE_C_FLAGS_MINSIZEREL "-Os" )
- SET( CMAKE_CXX_FLAGS_RELEASE "-O3" )
- SET( CMAKE_C_FLAGS_RELEASE "-O3" )
+ SET( CMAKE_CXX_FLAGS_RELEASE "" )
+ SET( CMAKE_C_FLAGS_RELEASE "" )
SET( CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g3" )
SET( CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -g3" )

View File

@ -1,34 +0,0 @@
diff --git a/buildtools/LibyuiCommon.cmake b/buildtools/LibyuiCommon.cmake
index 18453bc..c370bb1 100644
--- buildtools/LibyuiCommon.cmake
+++ buildtools/LibyuiCommon.cmake
@@ -41,6 +41,7 @@ MACRO( SET_OPTIONS ) # setup configurable options
OPTION( DISABLE_SHARED "Shall I build a static library, only?" OFF )
OPTION( DOCS_ONLY "Shall \"make install\" install only docs, no binaries?" OFF )
+ OPTION( SKIP_LATEX "Shall I skip the generation of LaTeX PDF-docs?" OFF )
OPTION( ENABLE_STATIC "Shall I build a static library, too?" OFF )
OPTION( ENABLE_DEBUG "Shall I include Debug-Symbols in Release?" OFF )
OPTION( ENABLE_EXAMPLES "Shall I compile the examples, too?" OFF )
@@ -266,7 +267,7 @@ MACRO( SET_AUTODOCS ) # looks for doxygen, dot and latex and setup autodocs acc
AND NOT ${MAKEINDEX_COMPILER} STREQUAL "MAKEINDEX_COMPILER-NOTFOUND"
)
- IF( ${LATEX_COND} )
+ IF( ${LATEX_COND} AND NOT SKIP_LATEX )
MESSAGE( STATUS "Found LaTeX: ${PDFLATEX_COMPILER}" )
MESSAGE( STATUS "Found LaTeX: ${MAKEINDEX_COMPILER}" )
SET( BUILD_LATEX "YES" )
@@ -286,10 +287,10 @@ MACRO( SET_AUTODOCS ) # looks for doxygen, dot and latex and setup autodocs acc
)
ENDIF( INSTALL_DOCS OR DOCS_ONLY )
- ELSE( ${LATEX_COND} )
+ ELSE( ${LATEX_COND} AND NOT SKIP_LATEX )
MESSAGE( STATUS "Checking for LaTeX: not found" )
SET( BUILD_LATEX "NO" )
- ENDIF( ${LATEX_COND} )
+ ENDIF( ${LATEX_COND} AND NOT SKIP_LATEX )
ADD_CUSTOM_TARGET( ${DOXYGEN_TARGET}
${DOXYGEN_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile"

View File

@ -1 +1 @@
6849ce6b7775acfa00170fd8fb065c2d libyui-3.0.4-37f6bc2.tar.gz
4719a1679ddd5f2fe8a678b82920449a libyui-3.0.5-4d4bf96.tar.gz