Accepting request 517278 from GNOME:Next
I think we could push this to TW even now, at least to GF, as it does not follow normal GNOME schedule. OBS-URL: https://build.opensuse.org/request/show/517278 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk-doc?expand=0&rev=50
This commit is contained in:
parent
ffbba54eed
commit
ac44688dc7
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:1ea46ed400e6501f975acaafea31479cea8f32f911dca4dff036f59e6464fd42
|
|
||||||
size 673184
|
|
3
gtk-doc-1.26.tar.xz
Normal file
3
gtk-doc-1.26.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:bff3f44467b1d39775e94fad545f050faa7e8d68dc6a31aef5024ba3c2d7f2b7
|
||||||
|
size 706432
|
@ -1,3 +1,17 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Aug 15 06:34:21 UTC 2017 - zaitor@opensuse.org
|
||||||
|
|
||||||
|
- Update to version 1.26:
|
||||||
|
+ Remove tmpl support (gtkdoc-mktmpl).
|
||||||
|
+ Port all tools from bash/perl to python.
|
||||||
|
+ Bugs fixed: bgo#773879, bgo#780789, bgo#752126, bgo#753052,
|
||||||
|
bgo#758137, bgo#764407, bgo#764543, bgo#768675, bgo#769125,
|
||||||
|
bgo#769341, bgo#771255, bgo#773151, bgo#774168, bgo#774812,
|
||||||
|
bgo#778144, bgo#779566, bgo#784177.
|
||||||
|
- Drop reproducible.patch, fixed upstream.
|
||||||
|
- Add python-six and python3-six Requires, needed after upstreams
|
||||||
|
port to python.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Jun 29 08:14:06 UTC 2017 - bwiedemann@suse.com
|
Thu Jun 29 08:14:06 UTC 2017 - bwiedemann@suse.com
|
||||||
|
|
||||||
|
10
gtk-doc.spec
10
gtk-doc.spec
@ -17,15 +17,13 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: gtk-doc
|
Name: gtk-doc
|
||||||
Version: 1.25
|
Version: 1.26
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: GTK+ DocBook Documentation Generator
|
Summary: GTK+ DocBook Documentation Generator
|
||||||
License: GPL-2.0+
|
License: GPL-2.0+
|
||||||
Group: Productivity/Publishing/SGML
|
Group: Productivity/Publishing/SGML
|
||||||
Url: http://www.gtk.org/gtk-doc/
|
Url: http://www.gtk.org/gtk-doc/
|
||||||
Source: http://download.gnome.org/sources/gtk-doc/1.25/%{name}-%{version}.tar.xz
|
Source: https://download.gnome.org/sources/gtk-doc/1.26/%{name}-%{version}.tar.xz
|
||||||
# PATCH-FIX-UPSTREAM reproducible.patch bgo#784177 bwiedemann@suse.com -- Sort input file lists
|
|
||||||
Patch0: reproducible.patch
|
|
||||||
# When updating this package, please don't forget to update the gtk-doc.m4 Source
|
# When updating this package, please don't forget to update the gtk-doc.m4 Source
|
||||||
# in glib2.
|
# in glib2.
|
||||||
BuildRequires: docbook-xsl-stylesheets
|
BuildRequires: docbook-xsl-stylesheets
|
||||||
@ -40,6 +38,8 @@ Requires: docbook-xsl-stylesheets
|
|||||||
Requires: docbook_4
|
Requires: docbook_4
|
||||||
Requires: libxml2-tools
|
Requires: libxml2-tools
|
||||||
Requires: openjade
|
Requires: openjade
|
||||||
|
Requires: python-six
|
||||||
|
Requires: python3-six
|
||||||
Requires: xsltproc
|
Requires: xsltproc
|
||||||
Recommends: source-highlight
|
Recommends: source-highlight
|
||||||
Recommends: %{name}-lang
|
Recommends: %{name}-lang
|
||||||
@ -58,7 +58,6 @@ generate the documentation for GLib, Gtk+, and GNOME.
|
|||||||
%lang_package
|
%lang_package
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --disable-scrollkeeper
|
%configure --disable-scrollkeeper
|
||||||
@ -81,7 +80,6 @@ mv -v doc/README doc/doc.README
|
|||||||
%{_datadir}/aclocal/gtk-doc.m4
|
%{_datadir}/aclocal/gtk-doc.m4
|
||||||
%{_datadir}/gtk-doc/
|
%{_datadir}/gtk-doc/
|
||||||
%{_datadir}/pkgconfig/gtk-doc.pc
|
%{_datadir}/pkgconfig/gtk-doc.pc
|
||||||
%{_datadir}/sgml/gtk-doc/
|
|
||||||
%doc %{_datadir}/help/C/gtk-doc-manual/
|
%doc %{_datadir}/help/C/gtk-doc-manual/
|
||||||
|
|
||||||
%files lang -f %{name}-manual.lang
|
%files lang -f %{name}-manual.lang
|
||||||
|
@ -1,79 +0,0 @@
|
|||||||
sort directory listings
|
|
||||||
|
|
||||||
because ordering matters in some places
|
|
||||||
when we want to generate reproducible results
|
|
||||||
|
|
||||||
to fix https://bugzilla.gnome.org/show_bug.cgi?id=784177
|
|
||||||
|
|
||||||
See also https://reproducible-builds.org/docs/stable-inputs/ on that topic
|
|
||||||
|
|
||||||
Index: gtk-doc-1.25/gtkdoc-scan.in
|
|
||||||
===================================================================
|
|
||||||
--- gtk-doc-1.25.orig/gtkdoc-scan.in
|
|
||||||
+++ gtk-doc-1.25/gtkdoc-scan.in
|
|
||||||
@@ -223,7 +223,7 @@ sub ScanHeaders {
|
|
||||||
opendir (SRCDIR, $source_dir)
|
|
||||||
|| die "Can't open source directory $source_dir: $!";
|
|
||||||
my $file;
|
|
||||||
- foreach $file (readdir (SRCDIR)) {
|
|
||||||
+ foreach $file (sort (readdir (SRCDIR))) {
|
|
||||||
if ($file eq '.' || $file eq '..' || $file =~ /^\./) {
|
|
||||||
next;
|
|
||||||
} elsif (-d "$source_dir/$file") {
|
|
||||||
Index: gtk-doc-1.25/gtkdoc-fixxref.in
|
|
||||||
===================================================================
|
|
||||||
--- gtk-doc-1.25.orig/gtkdoc-fixxref.in
|
|
||||||
+++ gtk-doc-1.25/gtkdoc-fixxref.in
|
|
||||||
@@ -204,7 +204,7 @@ sub ScanIndices {
|
|
||||||
|
|
||||||
opendir (HTMLDIR, $scan_dir) || return;
|
|
||||||
my $file;
|
|
||||||
- foreach $file (readdir (HTMLDIR)) {
|
|
||||||
+ foreach $file (sort (readdir (HTMLDIR))) {
|
|
||||||
if ($file eq '.' || $file eq '..') {
|
|
||||||
next;
|
|
||||||
} elsif (-d "$scan_dir/$file") {
|
|
||||||
@@ -323,7 +323,7 @@ sub FixCrossReferences {
|
|
||||||
opendir (HTMLDIR, $scan_dir)
|
|
||||||
|| die "Can't open HTML directory $scan_dir: $!";
|
|
||||||
my $file;
|
|
||||||
- foreach $file (readdir (HTMLDIR)) {
|
|
||||||
+ foreach $file (sort (readdir (HTMLDIR))) {
|
|
||||||
if ($file eq '.' || $file eq '..') {
|
|
||||||
next;
|
|
||||||
} elsif ($file =~ m/.html?$/) {
|
|
||||||
Index: gtk-doc-1.25/gtkdoc-mkdb.in
|
|
||||||
===================================================================
|
|
||||||
--- gtk-doc-1.25.orig/gtkdoc-mkdb.in
|
|
||||||
+++ gtk-doc-1.25/gtkdoc-mkdb.in
|
|
||||||
@@ -3900,7 +3900,7 @@ sub ReadSourceDocumentation {
|
|
||||||
opendir (SRCDIR, $source_dir)
|
|
||||||
|| die "Can't open source directory $source_dir: $!";
|
|
||||||
|
|
||||||
- foreach $file (readdir (SRCDIR)) {
|
|
||||||
+ foreach $file (sort (readdir (SRCDIR))) {
|
|
||||||
if ($file =~ /^\./) {
|
|
||||||
next;
|
|
||||||
} elsif (-d "$source_dir/$file") {
|
|
||||||
Index: gtk-doc-1.25/gtkdoc-rebase.in
|
|
||||||
===================================================================
|
|
||||||
--- gtk-doc-1.25.orig/gtkdoc-rebase.in
|
|
||||||
+++ gtk-doc-1.25/gtkdoc-rebase.in
|
|
||||||
@@ -157,7 +157,7 @@ sub ScanDirectory {
|
|
||||||
my $file;
|
|
||||||
my $onlinedir;
|
|
||||||
my $have_index = 0;
|
|
||||||
- foreach $file (readdir(HTMLDIR)) {
|
|
||||||
+ foreach $file (sort (readdir(HTMLDIR))) {
|
|
||||||
if ($file eq '.' or $file eq '..') {
|
|
||||||
next;
|
|
||||||
}
|
|
||||||
@@ -291,7 +291,7 @@ sub RebaseReferences {
|
|
||||||
my ($dir) = @_;
|
|
||||||
|
|
||||||
opendir(HTMLDIR, $dir) || die "Can't open HTML directory $dir: $!";
|
|
||||||
- foreach my $file (readdir(HTMLDIR)) {
|
|
||||||
+ foreach my $file (sort (readdir(HTMLDIR))) {
|
|
||||||
if ($file =~ m/\.html?$/) {
|
|
||||||
&RebaseFile("$dir$file");
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user