Hello community, here is the log from the commit of package SuSEfirewall2 for openSUSE:Factory checked in at 2016-01-23 01:16:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/SuSEfirewall2 (Old) and /work/SRC/openSUSE:Factory/.SuSEfirewall2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "SuSEfirewall2" Changes: -------- --- /work/SRC/openSUSE:Factory/SuSEfirewall2/SuSEfirewall2.changes 2015-06-30 10:15:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.SuSEfirewall2.new/SuSEfirewall2.changes 2016-01-23 01:16:11.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Jan 18 12:44:38 UTC 2016 - meiss...@suse.com + +- Merge pull request #5 from hwoarang/firewalld-conflict +- SuSEfirewall2{,_init}.service: Conflict with firewalld service + +------------------------------------------------------------------- +Fri Jan 15 16:36:15 UTC 2016 - meiss...@suse.com + +- basic.service -> basic.target (bsc#961258) + +------------------------------------------------------------------- Old: ---- SuSEfirewall2-3.6.315.tar.bz2 New: ---- SuSEfirewall2-3.6.318.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SuSEfirewall2.spec ++++++ --- /var/tmp/diff_new_pack.a78Wpt/_old 2016-01-23 01:16:12.000000000 +0100 +++ /var/tmp/diff_new_pack.a78Wpt/_new 2016-01-23 01:16:12.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package SuSEfirewall2 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -18,7 +18,7 @@ Name: SuSEfirewall2 -Version: 3.6.315 +Version: 3.6.318 Release: 0 Url: http://en.opensuse.org/SuSEfirewall2 PreReq: %fillup_prereq %insserv_prereq /bin/sed textutils fileutils grep filesystem ++++++ SuSEfirewall2-3.6.315.tar.bz2 -> SuSEfirewall2-3.6.318.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SuSEfirewall2-3.6.315/SuSEfirewall2.service new/SuSEfirewall2-3.6.318/SuSEfirewall2.service --- old/SuSEfirewall2-3.6.315/SuSEfirewall2.service 2015-06-24 14:06:41.000000000 +0200 +++ new/SuSEfirewall2-3.6.318/SuSEfirewall2.service 2016-01-18 13:00:33.000000000 +0100 @@ -2,6 +2,7 @@ Description=SuSEfirewall2 phase 2 After=network.target ypbind.service nfs.service nfsserver.service rpcbind.service SuSEfirewall2_init.service Wants=SuSEfirewall2_init.service +Conflicts=firewalld.service [Service] ExecStart=/usr/sbin/SuSEfirewall2 boot_setup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SuSEfirewall2-3.6.315/SuSEfirewall2_init.service new/SuSEfirewall2-3.6.318/SuSEfirewall2_init.service --- old/SuSEfirewall2-3.6.315/SuSEfirewall2_init.service 2015-06-24 14:06:41.000000000 +0200 +++ new/SuSEfirewall2-3.6.318/SuSEfirewall2_init.service 2016-01-18 13:00:33.000000000 +0100 @@ -1,7 +1,8 @@ [Unit] Description=SuSEfirewall2 phase 1 Before=network.service -Before=basic.service +Before=basic.target +Conflicts=firewalld.service [Service] ExecStart=/usr/sbin/SuSEfirewall2 boot_init