- Sort a bit with spec-cleaner

- Install license with the library
  * Added patch ignore_runtests_failure.patch

- Sort a bit with spec-cleaner
- Install license with the library

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=220

curl-mini.changes

@@ -1,8 +1,15 @@
+-------------------------------------------------------------------
+Tue Feb 20 09:48:49 UTC 2018 - tchvatal@suse.com
+
+- Sort a bit with spec-cleaner
+- Install license with the library
+
 -------------------------------------------------------------------
 Thu Jan 25 12:23:48 UTC 2018 - normand@linux.vnet.ibm.com
 
 - ignore all test failures for PowerPC as bypass boo#1075219
   (not only the 1501 previously skipped)
+  * Added patch ignore_runtests_failure.patch
 
 -------------------------------------------------------------------
 Wed Jan 24 11:41:36 UTC 2018 - asn@cryptomilk.org

curl-mini.spec

@@ -20,17 +20,14 @@
 %define bootstrap 1
 ##### WARNING: please do not edit this auto generated spec file. Use the curl.spec! #####
 %define mini -mini
-
-%bcond_with mozilla_nss
-# need ssl always for python-pycurl
-%bcond_without openssl
-
 %if 0%{?bootstrap}
 %bcond_with testsuite
 %else
 %bcond_without testsuite
 %endif
-
+%bcond_with mozilla_nss
+# need ssl always for python-pycurl
+%bcond_without openssl
 Name:           curl-mini
 Version:        7.58.0
 Release:        0
@@ -48,6 +45,7 @@ Patch2:         curl-secure-getenv.patch
 Patch3:         ignore_runtests_failure.patch
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
+Requires:       libcurl4%{?mini} = %{version}
 %if !0%{?bootstrap}
 BuildRequires:  groff
 BuildRequires:  krb5-mini-devel
@@ -65,8 +63,6 @@ Conflicts:      curl
 # The -mini package is sufficient for the build hosts
 Provides:       curl = %{version}
 %endif
-Requires:       libcurl4%{?mini} = %{version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{with openssl}
 BuildRequires:  pkgconfig(libssl)
 %endif
@@ -78,10 +74,6 @@ BuildRequires:  mozilla-nss-devel
 # used by the testsuite
 BuildRequires:  stunnel
 %endif
-# bug437293
-%ifarch ppc64
-Obsoletes:      curl-64bit
-%endif
 
 %description
 Curl is a client to get documents and files from or send documents to a
@@ -111,8 +103,8 @@ Provides:       curl-devel <= 7.15.5
 Obsoletes:      curl-devel < 7.16.2
 %if 0%{?bootstrap}
 Requires:       this-is-only-for-build-envs
-Provides:       libcurl-devel = %{version}-%{release}
 Conflicts:      libcurl-devel
+Provides:       libcurl-devel = %{version}-%{release}
 %endif
 
 %description -n libcurl%{?mini}-devel
@@ -122,7 +114,7 @@ DICT, TELNET, LDAP, or FILE). The command is designed to work without
 user interaction or any kind of interactivity.
 
 %prep
-%setup -q -n curl-%version
+%setup -q -n curl-%{version}
 %patch0
 %patch1
 %patch2
@@ -196,14 +188,13 @@ popd
 rm -f %{buildroot}%{_libdir}/libcurl.la
 install -Dm 0644 docs/libcurl/libcurl.m4 %{buildroot}%{_datadir}/aclocal/libcurl.m4
 pushd scripts
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+%make_install
 popd
 
 %post -n libcurl4%{?mini} -p /sbin/ldconfig
 %postun -n libcurl4%{?mini} -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
 %doc README RELEASE-NOTES
 %doc docs/{BUGS,FAQ,FEATURES,MANUAL,RESOURCES,TODO,TheArtOfHttpScripting}
 %{_bindir}/curl
@@ -213,11 +204,10 @@ popd
 %dir %{_datadir}/zsh/site-functions
 
 %files -n libcurl4%{?mini}
-%defattr(-,root,root)
+%license COPYING
 %{_libdir}/libcurl.so.4*
 
 %files -n libcurl%{?mini}-devel
-%defattr(-,root,root)
 %{_bindir}/curl-config
 %{_includedir}/curl
 %dir %{_datadir}/aclocal/

curl.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Feb 20 09:48:49 UTC 2018 - tchvatal@suse.com
+
+- Sort a bit with spec-cleaner
+- Install license with the library
+
 -------------------------------------------------------------------
 Thu Jan 25 12:23:48 UTC 2018 - normand@linux.vnet.ibm.com
 

curl.spec

@@ -17,18 +17,15 @@
 
 
 %define bootstrap 0
-%define mini %nil
+%define mini %{nil}
-
-%bcond_with mozilla_nss
-# need ssl always for python-pycurl
-%bcond_without openssl
-
 %if 0%{?bootstrap}
 %bcond_with testsuite
 %else
 %bcond_without testsuite
 %endif
-
+%bcond_with mozilla_nss
+# need ssl always for python-pycurl
+%bcond_without openssl
 Name:           curl
 Version:        7.58.0
 Release:        0
@@ -46,6 +43,7 @@ Patch2:         curl-secure-getenv.patch
 Patch3:         ignore_runtests_failure.patch
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
+Requires:       libcurl4%{?mini} = %{version}
 %if !0%{?bootstrap}
 BuildRequires:  groff
 BuildRequires:  krb5-mini-devel
@@ -63,8 +61,6 @@ Conflicts:      curl
 # The -mini package is sufficient for the build hosts
 Provides:       curl = %{version}
 %endif
-Requires:       libcurl4%{?mini} = %{version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{with openssl}
 BuildRequires:  pkgconfig(libssl)
 %endif
@@ -76,10 +72,6 @@ BuildRequires:  mozilla-nss-devel
 # used by the testsuite
 BuildRequires:  stunnel
 %endif
-# bug437293
-%ifarch ppc64
-Obsoletes:      curl-64bit
-%endif
 
 %description
 Curl is a client to get documents and files from or send documents to a
@@ -109,8 +101,8 @@ Provides:       curl-devel <= 7.15.5
 Obsoletes:      curl-devel < 7.16.2
 %if 0%{?bootstrap}
 Requires:       this-is-only-for-build-envs
-Provides:       libcurl-devel = %{version}-%{release}
 Conflicts:      libcurl-devel
+Provides:       libcurl-devel = %{version}-%{release}
 %endif
 
 %description -n libcurl%{?mini}-devel
@@ -120,7 +112,7 @@ DICT, TELNET, LDAP, or FILE). The command is designed to work without
 user interaction or any kind of interactivity.
 
 %prep
-%setup -q -n curl-%version
+%setup -q -n curl-%{version}
 %patch0
 %patch1
 %patch2
@@ -194,14 +186,13 @@ popd
 rm -f %{buildroot}%{_libdir}/libcurl.la
 install -Dm 0644 docs/libcurl/libcurl.m4 %{buildroot}%{_datadir}/aclocal/libcurl.m4
 pushd scripts
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+%make_install
 popd
 
 %post -n libcurl4%{?mini} -p /sbin/ldconfig
 %postun -n libcurl4%{?mini} -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
 %doc README RELEASE-NOTES
 %doc docs/{BUGS,FAQ,FEATURES,MANUAL,RESOURCES,TODO,TheArtOfHttpScripting}
 %{_bindir}/curl
@@ -211,11 +202,10 @@ popd
 %dir %{_datadir}/zsh/site-functions
 
 %files -n libcurl4%{?mini}
-%defattr(-,root,root)
+%license COPYING
 %{_libdir}/libcurl.so.4*
 
 %files -n libcurl%{?mini}-devel
-%defattr(-,root,root)
 %{_bindir}/curl-config
 %{_includedir}/curl
 %dir %{_datadir}/aclocal/