Skip to content

Commit

Permalink
[libwbxml2] Update to 0.11.6. Contributes to JB#25872
Browse files Browse the repository at this point in the history
Now using git submodule for source code.

Updates to the latest upstream version which supports the
WBXML_INSTALL_FULL_HEADERS flag to expose the internal API headers, and
adds this flag to the build specification.

The headers are needed to allow direct access to the WBXML tree.
  • Loading branch information
pvuorela authored and llewelld committed Feb 11, 2020
1 parent 2d472d5 commit 58a38cb
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 19 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
@@ -0,0 +1,3 @@
[submodule "upstream"]
path = upstream
url = https://github.com/libwbxml/libwbxml.git
39 changes: 20 additions & 19 deletions rpm/libwbxml2.spec
@@ -1,5 +1,5 @@
Name: libwbxml2
Version: 0.10.8
Version: 0.11.6
Release: 1
Summary: Library to parse, encode and handle WBXML documents
Group: System/Libraries
Expand All @@ -16,12 +16,6 @@ tools to Parse, Encode and Handle WBXML documents. The WBXML format
is a binary representation of XML, defined by the Wap Forum, and used
to reduce bandwidth in mobile communications.

%files
%defattr(-,root,root,-)
%license COPYING GNU-LGPL
%{_bindir}/*
%{_libdir}/*.so.*

%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Expand All @@ -30,12 +24,6 @@ Requires: %{name} = %{version}-%{release}
%description devel
%{summary}.

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc

%package doc
Summary: Documentation for %{name}
Group: Documentation
Expand All @@ -44,17 +32,13 @@ Requires: %{name} = %{version}-%{release}
%description doc
%{summary}.

%files doc
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}

%prep
%setup -q -n %{name}-%{version}
%setup -q -n %{name}-%{version}/upstream

%build
mkdir build
cd build
cmake -DCMAKE_INSTALL_PREFIX=/usr ..
cmake -DCMAKE_INSTALL_PREFIX=/usr -DWBXML_INSTALL_FULL_HEADERS=ON ..
make

%install
Expand All @@ -67,3 +51,20 @@ mv %{buildroot}%{_docdir}/* %{buildroot}%{_docdir}/%{name}-%{version}

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%license COPYING GNU-LGPL
%{_bindir}/*
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%{_datadir}/cmake/Modules/FindLibWbxml2.cmake

%files doc
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}
1 change: 1 addition & 0 deletions upstream
Submodule upstream added at bfd531

0 comments on commit 58a38cb

Please sign in to comment.