commit php7-pear-Net_Socket for openSUSE:Factory
Hello community,
here is the log from the commit of package php7-pear-Net_Socket for
openSUSE:Factory checked in at 2019-12-02 11:36:29
Comparing /work/SRC/openSUSE:Factory/php7-pear-Net_Socket (Old)
and /work/SRC/openSUSE:Factory/.php7-pear-Net_Socket.new.4691 (New)
Package is "php7-pear-Net_Socket"
Mon Dec 2 11:36:29 2019 rev:3 rq:752840 version:1.2.2
Changes:
---
/work/SRC/openSUSE:Factory/php7-pear-Net_Socket/php7-pear-Net_Socket.changes
2018-03-02 21:10:56.310601400 +0100
+++
/work/SRC/openSUSE:Factory/.php7-pear-Net_Socket.new.4691/php7-pear-Net_Socket.changes
2019-12-02 11:38:37.434464249 +0100
@@ -1,0 +2,6 @@
+Fri Nov 29 21:36:12 UTC 2019 - suse+bu...@de-korte.org
+
+- Use correct macro to reference metadata (boo#1158112)
+- Clean-up spec, use https for downloading
+
+---
Other differences:
--
++ php7-pear-Net_Socket.spec ++
--- /var/tmp/diff_new_pack.Al3nL7/_old 2019-12-02 11:38:37.770464320 +0100
+++ /var/tmp/diff_new_pack.Al3nL7/_new 2019-12-02 11:38:37.770464320 +0100
@@ -1,7 +1,7 @@
#
# spec file for package php7-pear-Net_Socket
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -24,19 +24,13 @@
Summary:Network Socket Interface
License:BSD-2-Clause
Group: Productivity/Networking/Web/Servers
-Url:http://pear.php.net/package/%{pear_name}
-Source:
http://download.pear.php.net/package/%{pear_name}-%{version}.tgz
+URL:https://pear.php.net/package/%{pear_name}
+Source: https://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRequires: %{php_name}-devel
BuildRequires: %{php_name}-pear
-Requires: %{php_name}
Requires: %{php_name}-pear
-Provides: php-pear-%{pear_name} = %{version}
Provides: php-pear(%{pear_name}) = %{version}
-Obsoletes: php5-pear-%{pear_name}
BuildArch: noarch
-%if 0%{?suse_version} < 1330
-BuildRequires: %{php_name}-macros
-%endif
%description
Net_Socket is a class interface to TCP sockets. It provides blocking
@@ -45,36 +39,37 @@
byte-order ip addresses).
%prep
-%setup -q -c
-mv package.xml %{pear_name}-%{version}
+%setup -q -n %{pear_name}-%{version}
+# move package.xml when needed
+[ -f ../package.xml ] && mv ../package.xml .
%build
%install
-pushd %{pear_name}-%{version}
%{__pear} install --nodeps --offline --packagingroot %{buildroot} package.xml
install -D -m 0644 package.xml %{buildroot}%{php_pearxmldir}/%{pear_name}.xml
-rm -rf %{buildroot}/%{php_peardir}/{doc,tmp}
-rm -rf
%{buildroot}/%{php_peardir}/.{filemap,lock,registry,channels,depdb,depdblock}
-popd
+
%{php_pear_gen_filelist}
%post
-# on `rpm -ivh` PARAM is 1
-# on `rpm -Uvh` PARAM is 2
if [ "$1" = "1" ]; then
- %{__pear} install --nodeps --soft --force --register-only
%{php_pearxmldir}/%{pear_name}.xml
+ # on "rpm -ivh"
+ %{__pear} install --nodeps --soft --force --register-only
%{php_pearxmldir}/%{pear_name}.xml || :
fi
if [ "$1" = "2" ]; then
- %{__pear} upgrade --offline --register-only
%{php_pearxmldir}/%{pear_name}.xml
+ # on "rpm -Uvh"
+ %{__pear} upgrade --offline --register-only
%{php_pearxmldir}/%{pear_name}.xml || :
fi
%postun
-# on `rpm -e` PARAM is 0
if [ "$1" = "0" ]; then
- %{__pear} uninstall --nodeps --ignore-errors --register-only
pear.php.net/%{pear_name}
+ # on "rpm -e"
+ %{__pear} uninstall --nodeps --ignore-errors --register-only
pear.php.net/%{pear_name} || :
fi
%files -f %{name}.files
+%docdir %{pear_docdir}
+%exclude %{pear_metadir}/.??*
+%exclude %{pear_testdir}
%changelog
commit php7-pear-Net_Socket for openSUSE:Factory
Hello community,
here is the log from the commit of package php7-pear-Net_Socket for
openSUSE:Factory checked in at 2018-03-02 21:10:50
Comparing /work/SRC/openSUSE:Factory/php7-pear-Net_Socket (Old)
and /work/SRC/openSUSE:Factory/.php7-pear-Net_Socket.new (New)
Package is "php7-pear-Net_Socket"
Fri Mar 2 21:10:50 2018 rev:2 rq:581677 version:1.2.2
Changes:
---
/work/SRC/openSUSE:Factory/php7-pear-Net_Socket/php7-pear-Net_Socket.changes
2017-11-15 16:50:27.356178602 +0100
+++
/work/SRC/openSUSE:Factory/.php7-pear-Net_Socket.new/php7-pear-Net_Socket.changes
2018-03-02 21:10:56.310601400 +0100
@@ -1,0 +2,5 @@
+Thu Mar 1 07:00:43 UTC 2018 - ec...@opensuse.org
+
+- fix rm -rf line in spec to remove .channels etc. in Factory also
+
+---
Other differences:
--
++ php7-pear-Net_Socket.spec ++
--- /var/tmp/diff_new_pack.GP2hPk/_old 2018-03-02 21:10:57.122572201 +0100
+++ /var/tmp/diff_new_pack.GP2hPk/_new 2018-03-02 21:10:57.126572057 +0100
@@ -1,7 +1,7 @@
#
# spec file for package php7-pear-Net_Socket
#
-# 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
@@ -54,8 +54,8 @@
pushd %{pear_name}-%{version}
%{__pear} install --nodeps --offline --packagingroot %{buildroot} package.xml
install -D -m 0644 package.xml %{buildroot}%{php_pearxmldir}/%{pear_name}.xml
-rm -rf %{buildroot}/%{pear_phpdir}/{doc,tmp}
-rm -rf
%{buildroot}/%{pear_phpdir}/.{filemap,lock,registry,channels,depdb,depdblock}
+rm -rf %{buildroot}/%{php_peardir}/{doc,tmp}
+rm -rf
%{buildroot}/%{php_peardir}/.{filemap,lock,registry,channels,depdb,depdblock}
popd
%{php_pear_gen_filelist}
