Commit cb3d612b authored by dscho's avatar dscho

fix bug 968264: make rpm did not work with x11vnc package

parent 00901a2e
...@@ -15,9 +15,9 @@ if HAVE_RPM ...@@ -15,9 +15,9 @@ if HAVE_RPM
$(PACKAGE)-$(VERSION).tar.gz: dist $(PACKAGE)-$(VERSION).tar.gz: dist
# Rule to build RPM distribution package # 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@ cp $(PACKAGE)-$(VERSION).tar.gz @RPMSOURCEDIR@
rpm -ba libvncserver.spec rpm -ba $(PACKAGE).spec
endif endif
all: make_config_executable all: make_config_executable
......
...@@ -9,7 +9,7 @@ mv configure.ac configure.ac.LibVNCServer ...@@ -9,7 +9,7 @@ mv configure.ac configure.ac.LibVNCServer
cat configure.ac.LibVNCServer | \ cat configure.ac.LibVNCServer | \
sed -e "s/LibVNCServer, [^,)]*\([(,]\)*/x11vnc, $VERSION\1/g" \ sed -e "s/LibVNCServer, [^,)]*\([(,]\)*/x11vnc, $VERSION\1/g" \
-e "s/\(contrib\|examples\|vncterm\|libvncclient\|test\|client_examples\)\/Makefile//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" \ -e "s/^.*libvncserver-config//g" \
> configure.ac > configure.ac
...@@ -23,7 +23,7 @@ sed -e "s/^SUBDIRS.*$/SUBDIRS=libvncserver x11vnc/" \ ...@@ -23,7 +23,7 @@ sed -e "s/^SUBDIRS.*$/SUBDIRS=libvncserver x11vnc/" \
-e "s/include_/noinst_/" \ -e "s/include_/noinst_/" \
> Makefile.am > Makefile.am
cat libvncserver.spec.in | \ cat LibVNCServer.spec.in | \
sed -e "s/Johannes.Schindelin@gmx.de/runge@karlrunge.com/gi" \ sed -e "s/Johannes.Schindelin@gmx.de/runge@karlrunge.com/gi" \
-e "s/Johannes.Schindelin/Karl Runge/g" \ -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/" \ -e "s/a library to make writing a vnc server easy/a VNC server for the current X11 session/" \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment