Merge branch 'master' into f19

This commit is contained in:
Björn Esser 2013-08-30 10:57:34 +02:00
commit 20fae41478
3 changed files with 15 additions and 12 deletions

5
.gitignore vendored
View File

@ -1,5 +1,4 @@
*~
*.rpm
*.tar*
result_*/
/libyui-3.0.4-37f6bc2.tar.gz
/libyui-3.0.5-4d4bf96.tar.gz
results_*/

View File

@ -7,7 +7,7 @@
#%%global no_ui_dep 1
Name: lib%{libsuffix}
Version: 3.0.9
Version: 3.0.10
Release: 1%{?dist}
Summary: GUI-abstraction library
@ -76,12 +76,10 @@ a changelog and some brief examples how to build a UI using %{name}.
%build
mkdir -p build
cd build
pushd build
%cmake ..\
-DPREFIX=%{_prefix} \
-DLIB_DIR=%{_libdir} \
-DDOC_DIR=%{_defaultdocdir} \
-DDOC_SUBDIR=%{name}-%{version} \
-DCMAKE_BUILD_TYPE=RELEASE \
-DRESPECT_FLAGS=ON
make %{?_smp_mflags}
@ -89,7 +87,7 @@ make %{?_smp_mflags} docs
%install
cd build
pushd build
%make_install
install -m0755 -d %{buildroot}%{_libdir}/%{libsuffix}
@ -113,16 +111,16 @@ rm -rf ../html/*.m*
%files
%doc COPYING*
%{_libdir}/lib*.so.%{major_so_ver}*
%{_libdir}/%{name}.so.%{major_so_ver}*
%dir %{_libdir}/%{libsuffix}
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/theme
%files devel
%{_libdir}/lib*.so
%{_libdir}/%{name}.so
%{_libdir}/pkgconfig/%{name}.pc
%{_libdir}/cmake/
%{_libdir}/cmake
%files devel-common
@ -134,6 +132,12 @@ rm -rf ../html/*.m*
%doc COPYING* ChangeLog *.pdf examples/ html/
%changelog
* Fri Aug 30 2013 Björn Esser <bjoern.esser@gmail.com> - 3.0.10-1
- new upstream version
* Tue Jul 30 2013 Petr Machata <pmachata@redhat.com> - 3.0.9-2
- Rebuild for boost 1.54.0
* Sat Jul 27 2013 Björn Esser <bjoern.esser@gmail.com> - 3.0.9-1
- new upstream version
- restructured spec for better readability

View File

@ -1 +1 @@
cc2bd25c86131e9577350710c0e81ad2 libyui-3.0.9.tar.gz
c2fdaac58cfad64caf89b7a6a458d407 libyui-3.0.10.tar.gz