up to 0.52.22

diff --git a/gold.patch b/gold.patch
index 9a71cb96259a78b7ec898d770e59d1a26b836b1a..c592d25c9f7c65f1a15df72260276a0054e859cf 100644 (file)
--- a/gold.patch
+++ b/gold.patch
@@ -2,10 +2,10 @@
 +++ newt-0.52.13/configure.ac  2011-07-17 17:09:11.307821301 +0200
 @@ -19,7 +19,7 @@ AC_PROG_GREP
  AC_MSG_CHECKING([for GNU ld])
- LD=`$CC -print-prog-name=ld 2>&5`
+ LD=$($CC -print-prog-name=ld 2>&5)
  
--if test `$LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld"` = 0; then
-+if test `$LD -v 2>&1 | $ac_cv_path_GREP -cE "GNU (go)?ld"` = 0; then
+-if test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld") = 0; then
++if test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU (go)?ld") = 0; then
    # Not
    GNU_LD=""
    AC_MSG_RESULT([no])

diff --git a/newt-nopython.patch b/newt-nopython.patch
index b294e49aa0bada512ed8d075c4960b799def22c2..4a57ed5eec45e0c416efbe901e608834f93812f1 100644 (file)
--- a/newt-nopython.patch
+++ b/newt-nopython.patch
@@ -18,11 +18,11 @@
  test: test.o $(LIBNEWT)
        $(CC) -g -o test test.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
 @@ -149,7 +150,7 @@
+       install -m 644 whiptail.1 $(instroot)/$(man1dir)
        make -C po datadir=$(instroot)/$(datadir) install
-       install -m 644 libnewt.pc $(instroot)/$(pkgconfigdir)
  
 -install-sh: sharedlib $(WHIPTCLSO) _snack.$(SOEXT)
 +install-sh: sharedlib $(WHIPTCLSO) $(SNACKSO)
        [ -d $(instroot)/$(libdir) ] || install -m 755 -d $(instroot)/$(libdir)
-       install -m 755 $(LIBNEWTSH) $(instroot)/$(libdir)
-       ln -sf $(LIBNEWTSONAME) $(instroot)/$(libdir)/libnewt.$(SOEXT)
+       [ -d $(instroot)/$(includedir) ] || install -m 755 -d $(instroot)/$(includedir)
+       [ -d $(instroot)/$(pkgconfigdir) ] || install -m 755 -d $(instroot)/$(pkgconfigdir)

diff --git a/newt.spec b/newt.spec
index 18288a15bd8979332695fa7d131f03f4fb5406f6..d9e24906fa2e930428528f11a5ea6ef2c1398c27 100644 (file)
--- a/newt.spec
+++ b/newt.spec
@@ -16,12 +16,12 @@ Summary(fr.UTF-8):  Not Erik's Windowing Toolkit - fenêtrage en mode texte avec
 Summary(pl.UTF-8):     Not Erik's Windowing Toolkit - okna w trybie tekstowym ze slangiem
 Summary(tr.UTF-8):     Not Erik's Windowing Toolkit - metin kipi pencereleme sistemi
 Name:          newt
-Version:       0.52.21
-Release:       6
+Version:       0.52.22
+Release:       1
 License:       LGPL v2
 Group:         Libraries
 Source0:       https://releases.pagure.org/newt/%{name}-%{version}.tar.gz
-# Source0-md5: a0a5fd6b53bb167a65e15996b249ebb5
+# Source0-md5: 808ce286f607243de6560bd72e095f53
 Patch0:                %{name}-0.51.6-if1close.patch
 Patch1:                %{name}-nopython.patch
 Patch2:                %{name}-make.patch