From cb3d612bb144baa125d13403c0be7488902fa4a4 Mon Sep 17 00:00:00 2001 From: dscho Date: Mon, 7 Jun 2004 17:52:42 +0000 Subject: [PATCH] fix bug 968264: make rpm did not work with x11vnc package --- libvncserver.spec.in => LibVNCServer.spec.in | 0 Makefile.am | 4 ++-- prepare_x11vnc_dist.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename libvncserver.spec.in => LibVNCServer.spec.in (100%) mode change 100644 => 100755 diff --git a/libvncserver.spec.in b/LibVNCServer.spec.in old mode 100644 new mode 100755 similarity index 100% rename from libvncserver.spec.in rename to LibVNCServer.spec.in diff --git a/Makefile.am b/Makefile.am index 6398b5e..0f29ff6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,9 +15,9 @@ if HAVE_RPM $(PACKAGE)-$(VERSION).tar.gz: dist # Rule to build RPM distribution package -rpm: $(PACKAGE)-$(VERSION).tar.gz libvncserver.spec +rpm: $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE).spec cp $(PACKAGE)-$(VERSION).tar.gz @RPMSOURCEDIR@ - rpm -ba libvncserver.spec + rpm -ba $(PACKAGE).spec endif all: make_config_executable diff --git a/prepare_x11vnc_dist.sh b/prepare_x11vnc_dist.sh index 0b4aaad..1e1086e 100644 --- a/prepare_x11vnc_dist.sh +++ b/prepare_x11vnc_dist.sh @@ -9,7 +9,7 @@ mv configure.ac configure.ac.LibVNCServer cat configure.ac.LibVNCServer | \ sed -e "s/LibVNCServer, [^,)]*\([(,]\)*/x11vnc, $VERSION\1/g" \ -e "s/\(contrib\|examples\|vncterm\|libvncclient\|test\|client_examples\)\/Makefile//g" \ - -e "s/libvncserver.spec/x11vnc.spec/g" \ + -e "s/LibVNCServer.spec/x11vnc.spec/g" \ -e "s/^.*libvncserver-config//g" \ > configure.ac @@ -23,7 +23,7 @@ sed -e "s/^SUBDIRS.*$/SUBDIRS=libvncserver x11vnc/" \ -e "s/include_/noinst_/" \ > Makefile.am -cat libvncserver.spec.in | \ +cat LibVNCServer.spec.in | \ sed -e "s/Johannes.Schindelin@gmx.de/runge@karlrunge.com/gi" \ -e "s/Johannes.Schindelin/Karl Runge/g" \ -e "s/a library to make writing a vnc server easy/a VNC server for the current X11 session/" \