Merge branch 'master' into epel7

This commit is contained in:
Björn Esser 2014-03-18 12:36:00 +01:00
commit c4b37ee976
2 changed files with 14 additions and 25 deletions

View File

@ -1,14 +1,14 @@
%global libsuffix yui
%global major_so_ver 5
%global major_so_ver 6
# 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.
# Uncomment next line when rebuilding on ABI changes.
#%%global no_ui_dep 1
%global no_ui_dep 1
Name: lib%{libsuffix}
Version: 3.0.10
Release: 1%{?dist}
Version: 3.0.13
Release: 0%{?dist}
Summary: GUI-abstraction library
License: (LGPLv2 or LGPLv3) and MIT
@ -22,7 +22,7 @@ BuildRequires: fdupes
BuildRequires: graphviz
BuildRequires: pkgconfig
%{?!no_ui_dep:Requires: yui-ui%{?_isa} = %{major_so_ver}}
%{!?no_ui_dep:Requires: yui-ui%{?_isa} = %{major_so_ver}}
%description
@ -41,24 +41,14 @@ Summary: Files needed for developing with %{name}
Requires: boost-devel%{?_isa}
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-devel-common = %{version}-%{release}
Obsoletes: %{name}-devel-common <= %{version}-%{release}
%description devel
%{name} can be used independently of YaST for generic (C++) applications
and has very few dependencies.
%package devel-common
Summary: Common files needed for developing with %{name}
BuildArch: noarch
Requires: %{name}-devel = %{version}-%{release}
%description devel-common
%{summary}, e.g. headers and CMake-macros.
%package doc
Summary: Documentation files for %{name}
@ -116,22 +106,21 @@ rm -rf ../html/*.m*
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/theme
%files devel
%{_datadir}/%{name}/buildtools
%{_includedir}/%{libsuffix}
%{_libdir}/%{name}.so
%{_libdir}/pkgconfig/%{name}.pc
%{_libdir}/cmake
%files devel-common
%{_includedir}/%{libsuffix}
%{_datadir}/%{name}/buildtools
%files doc
%doc COPYING* ChangeLog *.pdf examples/ html/
%changelog
* Tue Mar 18 2014 Björn Esser <bjoern.esser@gmail.com> - 3.0.13-1
- new upstream release (#1048445)
* Fri Aug 30 2013 Björn Esser <bjoern.esser@gmail.com> - 3.0.10-1
- new upstream version

View File

@ -1 +1 @@
c2fdaac58cfad64caf89b7a6a458d407 libyui-3.0.10.tar.gz
7880c68fc624dc64c56ac756efa10d90 libyui-3.0.13.tar.gz