diff --git a/.gitignore b/.gitignore index d950c7a..13c6c8a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ PDCurses-3.4.tar.gz +/PDCurses-3.8.tar.gz diff --git a/0001-build-sys-add-WINDRES-variable.patch b/0001-build-sys-add-WINDRES-variable.patch new file mode 100644 index 0000000..1e9fb8a --- /dev/null +++ b/0001-build-sys-add-WINDRES-variable.patch @@ -0,0 +1,34 @@ +From 20dc63c46308f26b96550e051cd3e4f7ab176adc Mon Sep 17 00:00:00 2001 +From: rpm-build +Date: Wed, 14 Aug 2019 11:45:31 +0400 +Subject: [PATCH] build-sys: add WINDRES variable + +Signed-off-by: rpm-build +--- + wincon/Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/wincon/Makefile b/wincon/Makefile +index 6c5808f..46e0c34 100644 +--- a/wincon/Makefile ++++ b/wincon/Makefile +@@ -30,6 +30,7 @@ CC = gcc + AR = ar + STRIP = strip + LINK = gcc ++WINDRES = windres + + ifeq ($(DEBUG),Y) + CFLAGS = -g -Wall -DPDCDEBUG +@@ -87,7 +88,7 @@ $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS) $(RESOURCE) + $(LIBEXE) $(LIBFLAGS) $@ $? + + pdcurses.o: $(common)/pdcurses.rc +- windres -i $(common)/pdcurses.rc pdcurses.o ++ $(WINDRES) -i $(common)/pdcurses.rc pdcurses.o + + $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS) + $(PDCOBJS) : $(PDCURSES_WIN_H) +-- +2.23.0.rc1 + diff --git a/mingw-pdcurses-3.4-build.patch b/mingw-pdcurses-3.4-build.patch deleted file mode 100644 index dc34fe0..0000000 --- a/mingw-pdcurses-3.4-build.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -Naur PDCurses-3.4.orig/win32/mingwin32.mak PDCurses-3.4/win32/mingwin32.mak ---- PDCurses-3.4.orig/win32/mingwin32.mak 2008-07-21 14:31:36.000000000 +0200 -+++ PDCurses-3.4/win32/mingwin32.mak 2012-04-20 15:28:55.071506378 +0200 -@@ -19,6 +19,7 @@ - PDCURSES_WIN_H = $(osdir)/pdcwin.h - - CC = gcc -+STRIP = strip - - ifeq ($(DEBUG),Y) - CFLAGS = -g -Wall -DPDCDEBUG -@@ -30,8 +31,8 @@ - - CFLAGS += -I$(PDCURSES_SRCDIR) - --BASEDEF = $(PDCURSES_SRCDIR)\exp-base.def --WIDEDEF = $(PDCURSES_SRCDIR)\exp-wide.def -+BASEDEF = $(PDCURSES_SRCDIR)/exp-base.def -+WIDEDEF = $(PDCURSES_SRCDIR)/exp-wide.def - - DEFDEPS = $(BASEDEF) - -@@ -50,7 +51,7 @@ - - ifeq ($(DLL),Y) - CFLAGS += -DPDC_DLL_BUILD -- LIBEXE = gcc $(DEFFILE) -+ LIBEXE = $(CC) $(DEFFILE) - LIBFLAGS = -Wl,--out-implib,pdcurses.a -shared -o - LIBCURSES = pdcurses.dll - LIBDEPS = $(LIBOBJS) $(PDCOBJS) $(DEFFILE) -@@ -70,24 +71,24 @@ - libs: $(LIBCURSES) - - clean: -- -del *.o -- -del *.exe -- -del $(CLEAN) -+ -rm *.o -+ -rm *.exe -+ -rm $(CLEAN) - - demos: $(DEMOS) -- strip *.exe -+ $(STRIP) *.exe - - $(DEFFILE): $(DEFDEPS) - echo LIBRARY pdcurses > $@ - echo EXPORTS >> $@ -- type $(BASEDEF) >> $@ -+ cat $(BASEDEF) >> $@ - ifeq ($(WIDE),Y) -- type $(WIDEDEF) >> $@ -+ cat $(WIDEDEF) >> $@ - endif - - $(LIBCURSES) : $(LIBDEPS) - $(LIBEXE) $(LIBFLAGS) $@ $? -- -copy pdcurses.a panel.a -+ -cp pdcurses.a panel.a - - $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS) - $(PDCOBJS) : $(PDCURSES_WIN_H) diff --git a/mingw-pdcurses.spec b/mingw-pdcurses.spec index 9860867..dee4152 100644 --- a/mingw-pdcurses.spec +++ b/mingw-pdcurses.spec @@ -1,8 +1,8 @@ %?mingw_package_header Name: mingw-pdcurses -Version: 3.4 -Release: 24%{?dist} +Version: 3.8 +Release: 1%{?dist} Summary: Curses library for MinGW License: Public Domain @@ -11,7 +11,7 @@ Source0: http://downloads.sourceforge.net/pdcurses/PDCurses-%{version}.ta BuildArch: noarch -Patch0: mingw-pdcurses-3.4-build.patch +Patch0001: 0001-build-sys-add-WINDRES-variable.patch BuildRequires: mingw32-filesystem >= 95 BuildRequires: mingw32-gcc @@ -65,25 +65,27 @@ don't use any of the extensions specific to ncurses. %prep -%setup -q -n PDCurses-%{version} -%patch0 -p1 +%autosetup -S git_am -n PDCurses-%{version} -cp -a win32 win64 +cp -a wincon win32 +cp -a wincon win64 %build pushd win32 -make -f mingwin32.mak \ +make \ CC=%{mingw32_cc} \ LINK=%{mingw32_cc} \ STRIP=%{mingw32_strip} \ + WINDRES=%{mingw32_windres} \ WIDE=Y UTF8=Y DLL=Y popd pushd win64 -make -f mingwin32.mak \ +make \ CC=%{mingw64_cc} \ LINK=%{mingw64_cc} \ STRIP=%{mingw64_strip} \ + WINDRES=%{mingw64_windres} \ WIDE=Y UTF8=Y DLL=Y popd @@ -92,20 +94,18 @@ mkdir -p $RPM_BUILD_ROOT%{mingw32_bindir} mkdir -p $RPM_BUILD_ROOT%{mingw32_libdir} mkdir -p $RPM_BUILD_ROOT%{mingw32_includedir} -install win32/*.exe $RPM_BUILD_ROOT%{mingw32_bindir} install win32/pdcurses.dll $RPM_BUILD_ROOT%{mingw32_bindir}/pdcurses.dll install win32/pdcurses.a $RPM_BUILD_ROOT%{mingw32_libdir}/libpdcurses.dll.a -install -m 0644 curses.h panel.h term.h $RPM_BUILD_ROOT%{mingw32_includedir} +install -m 0644 curses.h panel.h $RPM_BUILD_ROOT%{mingw32_includedir} mkdir -p $RPM_BUILD_ROOT%{mingw64_bindir} mkdir -p $RPM_BUILD_ROOT%{mingw64_libdir} mkdir -p $RPM_BUILD_ROOT%{mingw64_includedir} -install win64/*.exe $RPM_BUILD_ROOT%{mingw64_bindir} install win64/pdcurses.dll $RPM_BUILD_ROOT%{mingw64_bindir}/pdcurses.dll install win64/pdcurses.a $RPM_BUILD_ROOT%{mingw64_libdir}/libpdcurses.dll.a -install -m 0644 curses.h panel.h term.h $RPM_BUILD_ROOT%{mingw64_includedir} +install -m 0644 curses.h panel.h $RPM_BUILD_ROOT%{mingw64_includedir} %files -n mingw32-pdcurses @@ -113,33 +113,19 @@ install -m 0644 curses.h panel.h term.h $RPM_BUILD_ROOT%{mingw64_includedir} %{mingw32_libdir}/libpdcurses.dll.a %{mingw32_includedir}/curses.h %{mingw32_includedir}/panel.h -%{mingw32_includedir}/term.h -%{mingw32_bindir}/firework.exe -%{mingw32_bindir}/newdemo.exe -%{mingw32_bindir}/ptest.exe -%{mingw32_bindir}/rain.exe -%{mingw32_bindir}/testcurs.exe -%{mingw32_bindir}/tuidemo.exe -%{mingw32_bindir}/xmas.exe -%{mingw32_bindir}/worm.exe %files -n mingw64-pdcurses %{mingw64_bindir}/pdcurses.dll %{mingw64_libdir}/libpdcurses.dll.a %{mingw64_includedir}/curses.h %{mingw64_includedir}/panel.h -%{mingw64_includedir}/term.h -%{mingw64_bindir}/firework.exe -%{mingw64_bindir}/newdemo.exe -%{mingw64_bindir}/ptest.exe -%{mingw64_bindir}/rain.exe -%{mingw64_bindir}/testcurs.exe -%{mingw64_bindir}/tuidemo.exe -%{mingw64_bindir}/xmas.exe -%{mingw64_bindir}/worm.exe %changelog +* Tue Aug 13 2019 Marc-André Lureau - 3.8-1 +- New upstream release 3.8 +- Removed demos and term.h + * Thu Jul 25 2019 Fedora Release Engineering - 3.4-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 9b9a69a..b870d8d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4e04e4412d1b1392a7f9a489b95b331a PDCurses-3.4.tar.gz +SHA512 (PDCurses-3.8.tar.gz) = 6c120932e8b02d60e0bc0fbbec8789fa9afa9a57ff0c42543c6227e617716e991655a7d4383df3a08456bbe0d1e1bafe84061074dca801df5ecf9a352b883b35