Accepting request 1005283 from home:AndreasStieger:branches:Base:System
popt 1.19 OBS-URL: https://build.opensuse.org/request/show/1005283 OBS-URL: https://build.opensuse.org/package/show/Base:System/popt?expand=0&rev=60
This commit is contained in:
parent
b60cd0c292
commit
536ae81433
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5159bc03a20b28ce363aa96765f37df99ea4d8850b1ece17d1e6ad5c24fdc5d1
|
||||
size 580569
|
BIN
popt-1.19.tar.gz
(Stored with Git LFS)
Normal file
BIN
popt-1.19.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,44 +1,43 @@
|
||||
Index: configure.ac
|
||||
Index: popt-1.19/configure.ac
|
||||
===================================================================
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -9,7 +9,6 @@
|
||||
--- popt-1.19.orig/configure.ac
|
||||
+++ popt-1.19/configure.ac
|
||||
@@ -9,7 +9,6 @@ AC_CONFIG_MACRO_DIR([m4])
|
||||
AM_INIT_AUTOMAKE([1.10 foreign -Wall])
|
||||
|
||||
AC_PROG_CC_STDC
|
||||
|
||||
m4_version_prereq([2.70], [], [AC_PROG_CC_STDC])
|
||||
-AC_PROG_CC
|
||||
AC_USE_SYSTEM_EXTENSIONS
|
||||
AM_PROG_AR
|
||||
|
||||
Index: src/system.h
|
||||
|
||||
Index: popt-1.19/src/system.h
|
||||
===================================================================
|
||||
--- a/src/system.h
|
||||
+++ b/src/system.h
|
||||
--- popt-1.19.orig/src/system.h
|
||||
+++ popt-1.19/src/system.h
|
||||
@@ -2,9 +2,7 @@
|
||||
* \file popt/system.h
|
||||
* @file
|
||||
*/
|
||||
|
||||
|
||||
-#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
-#endif
|
||||
|
||||
|
||||
#include <ctype.h>
|
||||
|
||||
@@ -57,6 +55,8 @@
|
||||
|
||||
@@ -57,6 +55,8 @@ static inline char * stpcpy (char *dest,
|
||||
#define getenv(_s) secure_getenv(_s)
|
||||
#elif defined(HAVE___SECURE_GETENV)
|
||||
#define getenv(_s) __secure_getenv(_s)
|
||||
+#else
|
||||
+#error neither secure_getenv nor __secure_getenv is available
|
||||
#endif
|
||||
|
||||
|
||||
#if !defined(__GNUC__) && !defined(__attribute__)
|
||||
|
||||
Index: src/popt.c
|
||||
Index: popt-1.19/src/popt.c
|
||||
===================================================================
|
||||
--- a/src/popt.c
|
||||
+++ b/src/popt.c
|
||||
@@ -197,7 +197,7 @@ poptContext poptGetContext(const char *
|
||||
--- popt-1.19.orig/src/popt.c
|
||||
+++ popt-1.19/src/popt.c
|
||||
@@ -181,7 +181,7 @@ poptContext poptGetContext(const char *
|
||||
con->execAbsolute = 1;
|
||||
con->arg_strip = NULL;
|
||||
|
||||
@ -47,7 +46,7 @@ Index: src/popt.c
|
||||
con->flags |= POPT_CONTEXT_POSIXMEHARDER;
|
||||
|
||||
if (name)
|
||||
@@ -442,7 +442,7 @@ const char * findProgramPath(/*@null@*/
|
||||
@@ -418,7 +418,7 @@ const char * findProgramPath(const char
|
||||
if (strchr(argv0, '/'))
|
||||
return xstrdup(argv0);
|
||||
|
||||
@ -56,7 +55,7 @@ Index: src/popt.c
|
||||
return NULL;
|
||||
|
||||
/* The return buffer in t is big enough for any path. */
|
||||
@@ -1706,6 +1706,7 @@ const char * poptBadOption(poptContext c
|
||||
@@ -1633,6 +1633,7 @@ const char * poptBadOption(poptContext c
|
||||
|
||||
const char * poptStrerror(const int error)
|
||||
{
|
||||
@ -64,7 +63,7 @@ Index: src/popt.c
|
||||
switch (error) {
|
||||
case POPT_ERROR_NOARG:
|
||||
return POPT_("missing argument");
|
||||
@@ -1728,7 +1729,7 @@ const char * poptStrerror(const int erro
|
||||
@@ -1657,7 +1658,7 @@ const char * poptStrerror(const int erro
|
||||
case POPT_ERROR_BADCONFIG:
|
||||
return POPT_("config file failed sanity test");
|
||||
case POPT_ERROR_ERRNO:
|
||||
@ -73,11 +72,11 @@ Index: src/popt.c
|
||||
default:
|
||||
return POPT_("unknown error");
|
||||
}
|
||||
Index: src/poptconfig.c
|
||||
Index: popt-1.19/src/poptconfig.c
|
||||
===================================================================
|
||||
--- a/src/poptconfig.c
|
||||
+++ b/src/poptconfig.c
|
||||
@@ -540,7 +540,7 @@ int poptReadDefaultConfig(poptContext co
|
||||
--- popt-1.19.orig/src/poptconfig.c
|
||||
+++ popt-1.19/src/poptconfig.c
|
||||
@@ -467,7 +467,7 @@ int poptReadDefaultConfig(poptContext co
|
||||
if (rc) goto exit;
|
||||
#endif
|
||||
|
||||
|
14
popt.changes
14
popt.changes
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Sep 17 16:31:44 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||
|
||||
- popt 1.19:
|
||||
* various build system fixes
|
||||
* various developer visible fixes
|
||||
* Fix the handling of superfluous args passed with =
|
||||
* Fix multiple resource and memory leaks
|
||||
* Fix '=' getting shown for short options
|
||||
* Improve random number handling
|
||||
* translation updates and documentation improvements
|
||||
- refresh spec file, run tests, package license in every package,
|
||||
and treat all compiler warnings and errors
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 7 10:56:25 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
|
||||
|
||||
|
27
popt.spec
27
popt.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package popt
|
||||
#
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -15,20 +15,21 @@
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%define soname libpopt0
|
||||
Name: popt
|
||||
Version: 1.18
|
||||
Version: 1.19
|
||||
Release: 0
|
||||
#!BuildIgnore: rpmlint-Factory
|
||||
Summary: A C library for parsing command line parameters
|
||||
License: MIT
|
||||
Group: Development/Libraries/C and C++
|
||||
URL: https://github.com/rpm-software-management/popt
|
||||
Source0: http://ftp.rpm.org/popt/releases/popt-1.x/popt-%{version}.tar.gz
|
||||
Source2: baselibs.conf
|
||||
Patch: popt-libc-updates.patch
|
||||
Patch0: popt-libc-updates.patch
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkgconfig
|
||||
#!BuildIgnore: rpmlint-Factory
|
||||
|
||||
%description
|
||||
Popt is a C library for parsing command line parameters. Popt was
|
||||
@ -57,8 +58,8 @@ parsing arbitrary strings into argv[] arrays using shell-like rules.
|
||||
%package devel
|
||||
Summary: Development files for the popt library
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: glibc-devel
|
||||
Requires: %{soname} = %{version}
|
||||
Requires: glibc-devel
|
||||
|
||||
%description devel
|
||||
The popt-devel package includes header files and libraries necessary
|
||||
@ -72,31 +73,37 @@ API documentation of the popt library, too.
|
||||
|
||||
%build
|
||||
autoreconf -fiv
|
||||
%configure --disable-static
|
||||
%configure \
|
||||
--disable-static \
|
||||
--enable-werror \
|
||||
%{nil}
|
||||
%make_build
|
||||
|
||||
%install
|
||||
%make_install
|
||||
rm %{buildroot}%{_libdir}/libpopt.la
|
||||
find %{buildroot} -type f -name "*.la" -delete -print
|
||||
|
||||
%find_lang %{name}
|
||||
|
||||
%post -n %{soname} -p /sbin/ldconfig
|
||||
%check
|
||||
%make_build check
|
||||
|
||||
%post -n %{soname} -p /sbin/ldconfig
|
||||
%postun -n %{soname} -p /sbin/ldconfig
|
||||
|
||||
%files -n %{soname}
|
||||
%license COPYING
|
||||
%doc CHANGES
|
||||
%{_libdir}/libpopt.so.*
|
||||
|
||||
%files lang -f %{name}.lang
|
||||
%license COPYING
|
||||
|
||||
%files devel
|
||||
%license COPYING
|
||||
%doc README
|
||||
%{_libdir}/libpopt.so
|
||||
%{_includedir}/popt.h
|
||||
%{_mandir}/man3/popt.3*
|
||||
%{_mandir}/man3/popt.3%{?ext_man}
|
||||
%{_libdir}/pkgconfig/popt.pc
|
||||
|
||||
%changelog
|
||||
|
Loading…
Reference in New Issue
Block a user