From b291511d0bca5161f57a074df34d6caa03ccd421 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Thu, 17 Oct 2013 16:49:04 +0200 Subject: [PATCH] rename snackmodule to snack (#963839) --- newt-snackrename.patch | 65 ++++++++++++++++++++++++++++++++++++++++++ newt.spec | 2 ++ 2 files changed, 67 insertions(+) create mode 100644 newt-snackrename.patch diff --git a/newt-snackrename.patch b/newt-snackrename.patch new file mode 100644 index 0000000..c6c8ee7 --- /dev/null +++ b/newt-snackrename.patch @@ -0,0 +1,65 @@ +commit 32a82f128de7ba505d8422f3ad1b98d2cb4a94a2 +Author: Miroslav Lichvar +Date: Thu Oct 17 16:13:27 2013 +0200 + + rename snackmodule to snack (#963839) + +diff --git a/Makefile.in b/Makefile.in +index 4d1e3c5..6b6f9b9 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -65,7 +65,7 @@ else + TARGET=depend $(PROGS) + endif + +-all: $(TARGET) _snackmodule.$(SOEXT) ++all: $(TARGET) _snack.$(SOEXT) + + test: test.o $(LIBNEWT) + $(CC) -g -o test test.o $(LIBNEWT) $(LDFLAGS) $(LIBS) +@@ -82,7 +82,7 @@ showchars: showchars.o $(LIBNEWT) + showkey: showkey.o $(LIBNEWT) + $(CC) -g -o showkey showkey.o $(LIBNEWT) $(LDFLAGS) $(LIBS) + +-_snackmodule.$(SOEXT): snackmodule.c $(LIBNEWTSH) ++_snack.$(SOEXT): snack.c $(LIBNEWTSH) + @[ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS); do \ + pyconfig=$$ver-config; \ + if ! $$pyconfig --cflags > /dev/null 2>&1 && \ +@@ -95,10 +95,10 @@ _snackmodule.$(SOEXT): snackmodule.c $(LIBNEWTSH) + PIFLAGS=`$$pyconfig --includes`; \ + PLDFLAGS=`$$pyconfig --ldflags`; \ + PLFLAGS=`$$pyconfig --libs`; \ +- echo $(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snackmodule.o snackmodule.c; \ +- $(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snackmodule.o snackmodule.c; \ +- echo $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snackmodule.$(SOEXT) $$ver/snackmodule.o -L. -lnewt $(LIBS); \ +- $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snackmodule.$(SOEXT) $$ver/snackmodule.o -L. -lnewt $(LIBS); \ ++ echo $(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \ ++ $(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \ ++ echo $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L. -lnewt $(LIBS); \ ++ $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L. -lnewt $(LIBS); \ + done || : + touch $@ + +@@ -149,7 +149,7 @@ install: $(LIBNEWT) install-sh whiptail + make -C po datadir=$(instroot)/$(datadir) install + install -m 644 libnewt.pc $(instroot)/$(pkgconfigdir) + +-install-sh: sharedlib $(WHIPTCLSO) _snackmodule.$(SOEXT) ++install-sh: sharedlib $(WHIPTCLSO) _snack.$(SOEXT) + [ -d $(instroot)/$(libdir) ] || install -m 755 -d $(instroot)/$(libdir) + install -m 755 $(LIBNEWTSH) $(instroot)/$(libdir) + ln -sf $(LIBNEWTSONAME) $(instroot)/$(libdir)/libnewt.$(SOEXT) +@@ -157,7 +157,7 @@ install-sh: sharedlib $(WHIPTCLSO) _snackmodule.$(SOEXT) + [ -n "$(WHIPTCLSO)" ] && install -m 755 whiptcl.$(SOEXT) $(instroot)/$(libdir) || : + [ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS) ; do \ + [ -d $(instroot)/$(libdir)/$$ver/site-packages ] || install -m 755 -d $(instroot)/$(libdir)/$$ver/site-packages ;\ +- install -m 755 $$ver/_snackmodule.$(SOEXT) $(instroot)/$(libdir)/$$ver/site-packages ;\ ++ install -m 755 $$ver/_snack.$(SOEXT) $(instroot)/$(libdir)/$$ver/site-packages ;\ + install -m 644 snack.py $(instroot)/$(libdir)/$$ver/site-packages ;\ + done || : + +diff --git a/snackmodule.c b/snack.c +similarity index 100% +rename from snackmodule.c +rename to snack.c diff --git a/newt.spec b/newt.spec index 2651291..62c6637 100644 --- a/newt.spec +++ b/newt.spec @@ -12,6 +12,7 @@ BuildRequires: docbook-utils Provides: snack = %{version}-%{release} Patch1: newt-python3.patch +Patch2: newt-snackrename.patch BuildRequires: autoconf %package devel @@ -60,6 +61,7 @@ providing a python API for creating text mode ionterfaces. %prep %setup -q %patch1 -p1 +%patch2 -p1 %build autoconf