Merge branch 'master' into epel7
This commit is contained in:
commit
c4b37ee976
37
libyui.spec
37
libyui.spec
|
@ -1,14 +1,14 @@
|
||||||
%global libsuffix yui
|
%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
|
# 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.
|
# to make it possible to (re)build plugin packages for libyui ABI changes.
|
||||||
# Uncomment next line when rebuilding on ABI changes.
|
# Uncomment next line when rebuilding on ABI changes.
|
||||||
#%%global no_ui_dep 1
|
%global no_ui_dep 1
|
||||||
|
|
||||||
Name: lib%{libsuffix}
|
Name: lib%{libsuffix}
|
||||||
Version: 3.0.10
|
Version: 3.0.13
|
||||||
Release: 1%{?dist}
|
Release: 0%{?dist}
|
||||||
Summary: GUI-abstraction library
|
Summary: GUI-abstraction library
|
||||||
|
|
||||||
License: (LGPLv2 or LGPLv3) and MIT
|
License: (LGPLv2 or LGPLv3) and MIT
|
||||||
|
@ -22,7 +22,7 @@ BuildRequires: fdupes
|
||||||
BuildRequires: graphviz
|
BuildRequires: graphviz
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
|
|
||||||
%{?!no_ui_dep:Requires: yui-ui%{?_isa} = %{major_so_ver}}
|
%{!?no_ui_dep:Requires: yui-ui%{?_isa} = %{major_so_ver}}
|
||||||
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
|
@ -41,24 +41,14 @@ Summary: Files needed for developing with %{name}
|
||||||
|
|
||||||
Requires: boost-devel%{?_isa}
|
Requires: boost-devel%{?_isa}
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
Requires: %{name}-devel-common = %{version}-%{release}
|
|
||||||
|
Obsoletes: %{name}-devel-common <= %{version}-%{release}
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
%{name} can be used independently of YaST for generic (C++) applications
|
%{name} can be used independently of YaST for generic (C++) applications
|
||||||
and has very few dependencies.
|
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
|
%package doc
|
||||||
Summary: Documentation files for %{name}
|
Summary: Documentation files for %{name}
|
||||||
|
|
||||||
|
@ -116,22 +106,21 @@ rm -rf ../html/*.m*
|
||||||
%dir %{_datadir}/%{name}
|
%dir %{_datadir}/%{name}
|
||||||
%dir %{_datadir}/%{name}/theme
|
%dir %{_datadir}/%{name}/theme
|
||||||
|
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
|
%{_datadir}/%{name}/buildtools
|
||||||
|
%{_includedir}/%{libsuffix}
|
||||||
%{_libdir}/%{name}.so
|
%{_libdir}/%{name}.so
|
||||||
%{_libdir}/pkgconfig/%{name}.pc
|
%{_libdir}/pkgconfig/%{name}.pc
|
||||||
%{_libdir}/cmake
|
%{_libdir}/cmake
|
||||||
|
|
||||||
|
|
||||||
%files devel-common
|
|
||||||
%{_includedir}/%{libsuffix}
|
|
||||||
%{_datadir}/%{name}/buildtools
|
|
||||||
|
|
||||||
|
|
||||||
%files doc
|
%files doc
|
||||||
%doc COPYING* ChangeLog *.pdf examples/ html/
|
%doc COPYING* ChangeLog *.pdf examples/ html/
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%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
|
* Fri Aug 30 2013 Björn Esser <bjoern.esser@gmail.com> - 3.0.10-1
|
||||||
- new upstream version
|
- new upstream version
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue