diff --git a/mxml-2.10.tar.gz b/mxml-2.10.tar.gz deleted file mode 100644 index b29bd21..0000000 --- a/mxml-2.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:267ff58b64ddc767170d71dab0c729c06f45e1df9a9b6f75180b564f09767891 -size 265398 diff --git a/mxml-2.11.tar.gz b/mxml-2.11.tar.gz new file mode 100644 index 0000000..654ea2e --- /dev/null +++ b/mxml-2.11.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d3dfe661e50908fe41aef9b97ba6f7f158cab5208515c6be9f5bc9daf032329 +size 9166624 diff --git a/mxml-2.3-nobinstrip.patch b/mxml-2.3-nobinstrip.patch deleted file mode 100644 index 9690c9b..0000000 --- a/mxml-2.3-nobinstrip.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in -+++ Makefile.in -@@ -56,7 +56,7 @@ - # Install commands... - # - --INSTALL_BIN = $(LIBTOOL) $(INSTALL) -m 755 -s -+INSTALL_BIN = $(LIBTOOL) $(INSTALL) -m 755 - INSTALL_DATA = $(INSTALL) -m 644 - INSTALL_DIR = $(INSTALL) -d - INSTALL_LIB = $(LIBTOOL) $(INSTALL) -m 755 diff --git a/mxml.changes b/mxml.changes index 647939b..7a42a0d 100644 --- a/mxml.changes +++ b/mxml.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Sun Jul 15 13:11:50 UTC 2018 - antoine.belvire@opensuse.org + +- Update to version 2.11: + * CDATA nodes now omit the trailing "]]" for convenience + (gh#michaelrsweet/mxml#170). + * Fixed a memory leak in mxmlDelete (gh#michaelrsweet/mxml#183) + * mxmlElementSetAttrf did not work with some versions of Visual + Studio (gh#michaelrsweet/mxml#184) + * Added mxmlElementGetAttrByIndex and mxmlELementGetAttrCount + functions (gh#michaelrsweet/mxml#185) + * The configure script now properly supports cross-compilation + (gh#michaelrsweet/mxml#188) + * The mxmldoc utility now supports generation of EPUB files + (gh#michaelrsweet/mxml#189) + * The mxmldoc utility now supports the SOURCE_DATE_EPOCH + environment variable for reproducible builds + (gh#michaelrsweet/mxml#193) + * The mxmldoc utility now supports Markdown + (gh#michaelrsweet/mxml#194) + * Fixed writing of custom data values (gh#michaelrsweet/mxml#201) + * Added mxmlNewOpaquef and mxmlSetOpaquef functions to add and + set formatted opaque string values. + * The mxmldoc utility scanned and loaded descriptive text + differently, causing the detailed descriptions ("discussion") + to be lost in generated documentation. + * The mxmldoc utility now supports @exclude format@ comments to + exclude documentation based on the output format. The format + string can be all to exclude documentation for all formats or a + comma-delimited list such as @exclude man,html@. +- Drop upstreamed patches: + * reproducible.path + * mxml-2.3-nobinstrip.patch +- Clean spec file. + ------------------------------------------------------------------- Tue Apr 25 04:45:36 UTC 2017 - bwiedemann@suse.com diff --git a/mxml.spec b/mxml.spec index e985844..c64bac9 100644 --- a/mxml.spec +++ b/mxml.spec @@ -1,7 +1,7 @@ # # spec file for package mxml # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,19 +17,14 @@ Name: mxml -Url: http://www.msweet.org/projects.php?Z3 -Version: 2.10 +Version: 2.11 Release: 0 Summary: Small XML Parsing Library -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ - -Source: http://www.msweet.org/files/project3/%{name}-%{version}.tar.gz +URL: https://www.msweet.org/mxml +Source: https://github.com/michaelrsweet/mxml/archive/v%{version}/%{name}-%{version}.tar.gz Source1: baselibs.conf -Patch: mxml-2.3-nobinstrip.patch -# PATCH-FIX-UPSTREAM -- https://github.com/michaelrsweet/mxml/commit/b79d3e0f07495b4a113f1ad95ae08c19664ea5ac -Patch1: reproducible.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkgconfig %description @@ -41,13 +36,11 @@ This package holds the commandline tools for mxml. %define library_name libmxml1 -%package -n %library_name -# +%package -n %{library_name} Summary: Shared library for mxml -License: LGPL-2.1+ Group: System/Libraries -%description -n %library_name +%description -n %{library_name} Mini-XML is a small XML parsing library that you can use to read XML and XML-like data files in your application without requiring large nonstandard libraries. @@ -55,11 +48,10 @@ nonstandard libraries. This package holds the shared library for mxml. %package devel -Requires: %{library_name} = %{version} -# Summary: Development files for mxml -License: GPL-2.0+ Group: Development/Libraries/C and C++ +Requires: %{library_name} = %{version} +Suggests: mxml-doc = %{version} %description devel Mini-XML is a small XML parsing library that you can use to read XML @@ -68,43 +60,46 @@ nonstandard libraries. This package holds the development files for mxml. +%package doc +Summary: Documentation for mxml +Group: Documentation/HTML +BuildArch: noarch + +%description doc +Mini-XML is a small XML parsing library that you can use to read XML +and XML-like data files in your application without requiring large +nonstandard libraries. + +This package holds the HTML documentation for mxml. + %prep -%setup -%patch -%patch1 -p1 +%setup -q %build %configure --enable-shared --with-docdir=%{_docdir}/%{name} make %{?_smp_mflags} %install -%makeinstall DSTROOT=%{buildroot} -# we dont want the static lib -%{__rm} -rv %{buildroot}%{_libdir}/libmxml.a +%make_install DSTROOT=%{buildroot} +rm -v %{buildroot}%{_libdir}/libmxml.a %post -n %{library_name} -p /sbin/ldconfig - %postun -n %{library_name} -p /sbin/ldconfig %files -%defattr(-,root,root) %{_bindir}/mxmldoc -%{_mandir}/man1/mxmldoc.1* -%doc %{_docdir}/%{name} -%exclude %{_docdir}/%{name}/mxml.html -%exclude %{_docdir}/%{name}/*gif +%{_mandir}/man1/mxmldoc.1%{?ext_man} %files -n %{library_name} -%defattr(-,root,root) %{_libdir}/libmxml.so.1* %files devel -%defattr(-,root,root) %{_includedir}/mxml.h %{_libdir}/libmxml.so %{_libdir}/pkgconfig/mxml.pc -%{_mandir}/man3/mxml.3* -%doc %{_docdir}/%{name}/mxml.html -%doc %{_docdir}/%{name}/*gif +%{_mandir}/man3/mxml.3%{?ext_man} + +%files doc +%{_docdir}/%{name} %changelog diff --git a/reproducible.patch b/reproducible.patch deleted file mode 100644 index e6beecc..0000000 --- a/reproducible.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b79d3e0f07495b4a113f1ad95ae08c19664ea5ac Mon Sep 17 00:00:00 2001 -From: Michael Sweet -Date: Sun, 23 Apr 2017 12:49:40 -0400 -Subject: [PATCH] Add support for SOURCE_DATE_EPOCH environment variable (Issue - #193) - ---- - CHANGES.md | 2 ++ - doc/mxml.man | 2 +- - mxmldoc.c | 9 ++++++++- - 3 files changed, 11 insertions(+), 2 deletions(-) - -diff --git a/mxmldoc.c b/mxmldoc.c -index 7f475ef..4abe707 100644 ---- a/mxmldoc.c -+++ b/mxmldoc.c -@@ -5604,6 +5604,7 @@ write_man(const char *man_name, /* I - Name of manpage */ - *parent; /* Parent class */ - int inscope; /* Variable/method scope */ - char prefix; /* Prefix character */ -+ const char *source_date_epoch; /* SOURCE_DATE_EPOCH environment variable */ - time_t curtime; /* Current time */ - struct tm *curdate; /* Current date */ - char buffer[1024]; /* String buffer */ -@@ -5617,9 +5618,15 @@ write_man(const char *man_name, /* I - Name of manpage */ - - /* - * Standard man page... -+ * -+ * Get the current date, using the SOURCE_DATE_EPOCH environment variable, if -+ * present, for the number of seconds since the epoch - this enables -+ * reproducible builds (Issue #193). - */ - -- curtime = time(NULL); -+ if ((source_date_epoch = getenv("SOURCE_DATE_EPOCH")) == NULL || (curtime = (time_t)strtol(source_date_epoch, NULL, 10)) <= 0) -+ curtime = time(NULL); -+ - curdate = localtime(&curtime); - strftime(buffer, sizeof(buffer), "%x", curdate); -