From cb3d612bb144baa125d13403c0be7488902fa4a4 Mon Sep 17 00:00:00 2001
From: dscho <dscho>
Date: Mon, 7 Jun 2004 17:52:42 +0000
Subject: fix bug 968264: make rpm did not work with x11vnc package

---
 LibVNCServer.spec.in   | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++
 Makefile.am            |  4 ++--
 libvncserver.spec.in   | 58 --------------------------------------------------
 prepare_x11vnc_dist.sh |  4 ++--
 4 files changed, 62 insertions(+), 62 deletions(-)
 create mode 100755 LibVNCServer.spec.in
 delete mode 100644 libvncserver.spec.in

diff --git a/LibVNCServer.spec.in b/LibVNCServer.spec.in
new file mode 100755
index 0000000..5c51acc
--- /dev/null
+++ b/LibVNCServer.spec.in
@@ -0,0 +1,58 @@
+# Note that this is NOT a relocatable package
+Name: @PACKAGE@
+Version: @VERSION@
+Release: 1
+Summary: a library to make writing a vnc server easy
+Copyright: GPL
+Group: Libraries/Network
+Packager: Johannes.Schindelin <Johannes.Schindelin@gmx.de>
+
+Source: %{name}-%{version}.tar.gz
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
+Prefix: %{_prefix}
+
+%description
+LibVNCServer makes writing a VNC server (or more correctly, a program
+exporting a framebuffer via the Remote Frame Buffer protocol) easy.
+
+It is based on OSXvnc, which in turn is based on the original Xvnc by
+ORL, later AT&T research labs in UK.
+
+It hides the programmer from the tedious task of managing clients and
+compression schemata.
+
+LibVNCServer was put together and is (actively ;-) maintained by
+Johannes Schindelin <Johannes.Schindelin@gmx.de>
+
+%prep
+%setup -n %{name}-%{version}
+
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix}
+
+make
+
+
+%install
+make install prefix=$RPM_BUILD_ROOT%{prefix}
+
+%clean
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+
+
+%pre
+%post
+%preun
+%postun
+
+
+%files
+%defattr(-,root,root)
+%{prefix}
+
+%changelog
+* Sun Feb 9 2003 Johannes Schindelin
+- created 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/libvncserver.spec.in b/libvncserver.spec.in
deleted file mode 100644
index 5c51acc..0000000
--- a/libvncserver.spec.in
+++ /dev/null
@@ -1,58 +0,0 @@
-# Note that this is NOT a relocatable package
-Name: @PACKAGE@
-Version: @VERSION@
-Release: 1
-Summary: a library to make writing a vnc server easy
-Copyright: GPL
-Group: Libraries/Network
-Packager: Johannes.Schindelin <Johannes.Schindelin@gmx.de>
-
-Source: %{name}-%{version}.tar.gz
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
-Prefix: %{_prefix}
-
-%description
-LibVNCServer makes writing a VNC server (or more correctly, a program
-exporting a framebuffer via the Remote Frame Buffer protocol) easy.
-
-It is based on OSXvnc, which in turn is based on the original Xvnc by
-ORL, later AT&T research labs in UK.
-
-It hides the programmer from the tedious task of managing clients and
-compression schemata.
-
-LibVNCServer was put together and is (actively ;-) maintained by
-Johannes Schindelin <Johannes.Schindelin@gmx.de>
-
-%prep
-%setup -n %{name}-%{version}
-
-
-%build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix}
-
-make
-
-
-%install
-make install prefix=$RPM_BUILD_ROOT%{prefix}
-
-%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-
-%pre
-%post
-%preun
-%postun
-
-
-%files
-%defattr(-,root,root)
-%{prefix}
-
-%changelog
-* Sun Feb 9 2003 Johannes Schindelin
-- created libvncserver.spec.in
-
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/" \
-- 
cgit v1.2.3