3.3.0-alt1

- 3.3.0
This commit is contained in:
kozorizki 2024-12-19 14:05:15 +03:00
parent 74ddc50f88
commit ec726f8fad
8 changed files with 52 additions and 33 deletions

View File

@ -3,8 +3,8 @@
Name: pve-%sname
Summary: SPICE Terminal Emulator
Version: 3.2.2
Release: alt2
Version: 3.3.0
Release: alt1
License: GPLv2
Group: Networking/WWW
Url: https://git.proxmox.com/
@ -38,6 +38,9 @@ sed -i 's|\ -Werror||' src/Makefile
%_man1dir/%sname.1*
%changelog
* Thu Dec 19 2024 Konstantin Kozoriz <kozorizki@altlinux.org> 3.3.0-alt1
- 3.3.0
* Tue Oct 31 2023 Alexey Sheplyakov <asheplyakov@altlinux.org> 3.2.2-alt2
- Also build on LoongArch

View File

@ -4,40 +4,45 @@ include /usr/share/dpkg/architecture.mk
PACKAGE=spiceterm
GITVERSION:=$(shell cat .git/refs/heads/master)
BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}
BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
export VERSION=$(DEB_VERSION_UPSTREAM)
DEB=$(PACKAGE)_$(DEB_VERSION)_$(DEB_HOST_ARCH).deb
DBG_DEB=$(PACKAGE)-dbgsym_$(DEB_VERSION)_$(DEB_HOST_ARCH).deb
DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb
DBG_DEB=${PACKAGE}-dbgsym_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb
DSC=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc
${BUILDDIR}: src/ debian/
$(BUILDDIR): src/ debian/
rm -rf $(BUILDDIR)
rsync -a src/ debian $(BUILDDIR)
echo "git clone git://git.proxmox.com/git/spiceterm.git\\ngit checkout ${GITVERSION}" > $(BUILDDIR)/debian/SOURCE
echo "git clone git://git.proxmox.com/git/spiceterm.git\\ngit checkout $(GITVERSION)" > $(BUILDDIR)/debian/SOURCE
.PHONY: dsc
dsc: ${DSC}
${DSC}: $(BUILDDIR)
dsc: clean
$(MAKE) $(DSC)
lintian $(DSC)
$(DSC): $(BUILDDIR)
cd $(BUILDDIR); dpkg-buildpackage -S -us -uc -d
lintian ${DSC}
sbuild: $(DSC)
sbuild $<
.PHONY: deb
deb: ${DEB}
${DEB}: $(BUILDDIR)
deb: $(DEB)
$(DEB): $(BUILDDIR)
cd $(BUILDDIR); dpkg-buildpackage -b -us -uc
lintian ${DEB}
lintian $(DEB)
.PHONY: dinstall
dinstall: ${DEB}
dpkg -i ${DEB}
dinstall: $(DEB)
dpkg -i $(DEB)
.PHONY: upload
upload: ${DEB}
tar cf - ${DEB} ${DBG_DEB} | ssh repoman@repo.proxmox.com -- upload --product pve --dist bullseye --arch ${ARCH}
upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
upload: $(DEB)
tar cf - $(DEB) $(DBG_DEB) | ssh repoman@repo.proxmox.com -- upload --product pve --dist $(UPLOAD_DIST) --arch $(DEB_HOST_ARCH)
.PHONY: distclean clean
distclean: clean
clean:
rm -rf *~ $(PACKAGE)-*/ *.deb *.changes genfont *.buildinfo *.dsc *.tar.gz
$(MAKE) -C src $@
rm -rf *~ $(PACKAGE)-*/ $(PACKAGE)*.tar* *.deb *.dsc *.changes *.build *.buildinfo

View File

@ -1,3 +1,11 @@
spiceterm (3.3.0) bookworm; urgency=medium
* switch to native versioning scheme
* re-build for Proxmox VE 12 / Debian 12 Bookworm
-- Proxmox Support Team <support@proxmox.com> Fri, 26 May 2023 15:07:46 +0200
spiceterm (3.2-2) bullseye; urgency=medium
* fix exit on client disconnect with newer libspice-server dependency's

View File

@ -1 +0,0 @@
12

View File

@ -2,11 +2,11 @@ Source: spiceterm
Section: admin
Priority: optional
Maintainer: Proxmox Support Team <support@proxmox.com>
Build-Depends: debhelper (>= 12),
Build-Depends: debhelper-compat (= 13),
libglib2.0-dev,
libspice-protocol-dev,
libspice-server-dev,
Standards-Version: 4.1.3
Standards-Version: 4.6.2
Package: spiceterm
Architecture: any

View File

@ -1,4 +1,4 @@
Copyright (C) 2013 Proxmox Server Solutions GmbH
Copyright (C) 2013 - 2023 Proxmox Server Solutions GmbH
Copyright: spiceterm is under GNU GPL, the GNU General Public License.

View File

@ -3,6 +3,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
include /usr/share/dpkg/pkg-info.mk
export VERSION = $(or $(DEB_VERSION_UPSTREAM), unknown)
%:
dh $@

View File

@ -1,4 +1,5 @@
PROGRAMS=spiceterm
VERSION ?= $(or $(shell git rev-parse --short HEAD), unknown)
HEADERS=translations.h event_loop.h glyphs.h spiceterm.h keysyms.h
SOURCES=screen.c event_loop.c input.c spiceterm.c auth-pve.c
@ -10,10 +11,10 @@ LIBS += `pkg-config --libs $(PKGS)`
#export G_MESSAGES_DEBUG=all
#export SPICE_DEBUG=1
all: ${PROGRAMS}
all: $(PROGRAMS)
spiceterm: ${SOURCES} ${HEADERS} spiceterm.c
gcc -Werror -Wall -Wl,-z,relro -Wtype-limits ${SOURCES} -g -O2 $(CFLAGS) -o $@ -lutil $(LIBS)
spiceterm: $(SOURCES) $(HEADERS) spiceterm.c
gcc -Werror -Wall -Wl,-z,relro -Wtype-limits $(SOURCES) -g -O2 $(CFLAGS) -o $@ -lutil $(LIBS)
genfont: genfont.c
gcc -g -O2 -o $@ genfont.c -Wall -D_GNU_SOURCE -lz
@ -27,14 +28,14 @@ glyphs: genfont
spiceterm.1: spiceterm.pod
rm -f $@
pod2man -n $< -s 1 -r ${VERSION} <$< >$@
pod2man -n $< -s 1 -r $(VERSION) <$< >$@
.PHONY: install
install: spiceterm spiceterm.1
mkdir -p ${DESTDIR}/usr/share/man/man1
install -m 0644 spiceterm.1 ${DESTDIR}/usr/share/man/man1
mkdir -p ${DESTDIR}/usr/bin
install -m 0755 spiceterm ${DESTDIR}/usr/bin
mkdir -p $(DESTDIR)/usr/share/man/man1
install -m 0644 spiceterm.1 $(DESTDIR)/usr/share/man/man1
mkdir -p $(DESTDIR)/usr/bin
install -m 0755 spiceterm $(DESTDIR)/usr/bin
.PHONY: test
test: spiceterm