Hello community,

here is the log from the commit of package simple-obfs for openSUSE:Factory 
checked in at 2018-04-16 12:48:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/simple-obfs (Old)
 and      /work/SRC/openSUSE:Factory/.simple-obfs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "simple-obfs"

Mon Apr 16 12:48:19 2018 rev:3 rq:596206 version:0.0.5

Changes:
--------
--- /work/SRC/openSUSE:Factory/simple-obfs/simple-obfs.changes  2017-11-17 
11:00:48.278964140 +0100
+++ /work/SRC/openSUSE:Factory/.simple-obfs.new/simple-obfs.changes     
2018-04-16 12:48:30.802150559 +0200
@@ -1,0 +2,12 @@
+Fri Apr 13 07:59:29 UTC 2018 - mplus...@suse.com
+
+- Cleanup spec file with spec-cleaner
+- Make building more verbose
+
+-------------------------------------------------------------------
+Wed Feb 28 12:33:10 CET 2018 - ti...@suse.de
+
+- Fix the documentation build with asciidoctor (bsc#1075764):
+  simple-obfs-asciidoc-fix.patch
+
+-------------------------------------------------------------------

New:
----
  simple-obfs-asciidoc-fix.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ simple-obfs.spec ++++++
--- /var/tmp/diff_new_pack.FnRc2p/_old  2018-04-16 12:48:32.286096577 +0200
+++ /var/tmp/diff_new_pack.FnRc2p/_new  2018-04-16 12:48:32.286096577 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package simple-obfs
 #
-# Copyright (c) 2017 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
@@ -20,26 +20,21 @@
 Version:        0.0.5
 Release:        0
 Summary:        A simple obfusacting tool
-License:        GPL-3.0+
+License:        GPL-3.0-or-later
 Group:          Productivity/Networking/Web/Proxy
-Url:            https://github.com/shadowsocks/simple-obfs
+URL:            https://github.com/shadowsocks/simple-obfs
 Source0:        
https://github.com/shadowsocks/simple-obfs/archive/v%{version}/%{name}-%{version}.tar.gz
 Source1:        libcork-0.15.0git20160622.tar.bz2
+Patch1:         simple-obfs-asciidoc-fix.patch
+BuildRequires:  asciidoc
 BuildRequires:  libtool
 BuildRequires:  mbedtls-devel
+BuildRequires:  pkgconfig
 BuildRequires:  udns-devel
+BuildRequires:  xmlto
 BuildRequires:  pkgconfig(libev)
 BuildRequires:  pkgconfig(libsodium) >= 1.0.4
 BuildRequires:  pkgconfig(openssl)
-%if 0%{?fedora} >= 24
-BuildRequires:  pkgconfig
-%else
-BuildRequires:  pkg-config
-%endif
-BuildRequires:  asciidoc
-BuildRequires:  xmlto
-%{?systemd_requires}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Simple-obfs is a simple obfusacting tool, designed as plugin server of 
shadowsocks.
@@ -57,29 +52,28 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 tar -jxvf %{SOURCE1}
 rmdir libcork
 mv libcork-0.15.0git20160622 libcork
-NOCONFIGURE=1 ./autogen.sh
+autoreconf -fiv
 %configure 
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
 %make_install
-
 rm -rf %{buildroot}%{_libdir}/*.{a,la}
 
 %files
-%defattr(-,root,root)
-%doc Changes README.md COPYING AUTHORS
-%{_mandir}/man1/obfs-*.1.gz
+%license COPYING
+%doc Changes README.md AUTHORS
+%{_mandir}/man1/obfs-*.1%{?ext_man}
 %{_bindir}/obfs-local
 %{_bindir}/obfs-server
 
 %files doc
-%defattr(-,root,root)
 %dir %{_datadir}/doc/%{name}
 %doc %{_datadir}/doc/%{name}/*.html
 

++++++ simple-obfs-asciidoc-fix.patch ++++++
From: Takashi Iwai <ti...@suse.de>
Subject: doc: Fix title markers

The title marker lines have to be aligned with the previous lines.
The error was caught by asciidoctor, which tends to be picker than
asciidoc.

Signed-off-by: Takashi Iwai <ti...@suse.de>

---
 doc/obfs-local.asciidoc  |    2 +-
 doc/obfs-server.asciidoc |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- a/doc/obfs-local.asciidoc
+++ b/doc/obfs-local.asciidoc
@@ -1,5 +1,5 @@
 obfs-local(1)
-===========
+=============
 
 NAME
 ----
--- a/doc/obfs-server.asciidoc
+++ b/doc/obfs-server.asciidoc
@@ -1,5 +1,5 @@
 obfs-server(1)
-============
+==============
 
 NAME
 ----

Reply via email to