split rpm into three packages: the library, -devel (headers), and x11vnc

3 files changed, 57 insertions, 14 deletions

diff --git a/AUTHORS b/AUTHORS
index b4d232e..dcecd8c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -24,7 +24,8 @@ archives and please don't beat me, if I forgot you, but just send me an
 email!): Akira Hatakeyama, Karl J. Runge, Justin "Zippy" Dearing,
 Oliver Mihatsch, Greg Sternberg, Werner Hofer, Giampiero Giancipoli,
 Glenn Mabutt, Paul Kreiner, Erik Kunze, Mike Frysinger, Martin Waitz,
-Mark McLoughlin, Paul Fox, Juan Jose Costello, Andre Leiadella.
+Mark McLoughlin, Paul Fox, Juan Jose Costello, Andre Leiadella,
+Alberto Lusiani.
 
 Probably I forgot quite a few people sending a patch here and there, which
 really made a difference. Without those, some obscure bugs still would
diff --git a/ChangeLog b/ChangeLog
index 8478ef3..96eb979 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2005-08-21  Alberto Lusiani <alusiani@gmail.com>
+	* libvncserver.spec.in: split rpm into libvncserver, -devel and x11vnc
+
 2005-07-12  Karl Runge <runge@karlrunge.com>
 	* x11vnc: tweaks for release, fix queue buildup under -viewonly
 
diff --git a/LibVNCServer.spec.in b/LibVNCServer.spec.in
index 5c51acc..3e93334 100755
--- a/LibVNCServer.spec.in
+++ b/LibVNCServer.spec.in
@@ -1,16 +1,13 @@
 # Note that this is NOT a relocatable package
 Name: @PACKAGE@
 Version: @VERSION@
-Release: 1
+Release: 2
 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
@@ -25,34 +22,76 @@ compression schemata.
 LibVNCServer was put together and is (actively ;-) maintained by
 Johannes Schindelin <Johannes.Schindelin@gmx.de>
 
+%package devel
+Requires:     %{name} = %{version}
+Summary:      Static Libraries and Header Files for LibVNCServer
+Group:        Libraries/Network
+Requires:     %{name} = %{version}
+
+%description devel
+Static Libraries and Header Files for LibVNCServer.
+
+%package x11vnc
+Requires:     %{name} = %{version}
+Summary:      VNC server for the current X11 session
+Group:        User Interface/X
+Requires:     %{name} = %{version}
+
+%description x11vnc
+x11vnc is to X Window System what WinVNC is to Windows, i.e. a server
+which serves the current X Window System desktop via RFB (VNC)
+protocol to the user.
+
+Based on the ideas of x0rfbserver and on LibVNCServer, it has evolved
+into a versatile and performant while still easy to use program.
+
 %prep
 %setup -n %{name}-%{version}
 
-
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix}
-
+# CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix}
+%configure
 make
 
-
 %install
-make install prefix=$RPM_BUILD_ROOT%{prefix}
+[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot}
+# make install prefix=%{buildroot}%{_prefix}
+%makeinstall includedir="%{buildroot}%{_includedir}/rfb"
 
-%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+%{__install} -d -m0755 %{buildroot}%{_datadir}/x11vnc/classes
+%{__install} classes/VncViewer.jar classes/index.vnc \
+  %{buildroot}%{_datadir}/x11vnc/classes
 
+%clean
+[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot}
 
 %pre
 %post
 %preun
 %postun
 
-
 %files
 %defattr(-,root,root)
-%{prefix}
+%doc README INSTALL AUTHORS ChangeLog NEWS TODO 
+%{_bindir}/LinuxVNC
+%{_bindir}/libvncserver-config
+%{_libdir}/libvncclient.*
+%{_libdir}/libvncserver.*
+
+%files devel
+%defattr(-,root,root)
+%{_includedir}/rfb/*
+
+%files x11vnc
+%defattr(-,root,root)
+%{_bindir}/x11vnc
+%{_mandir}/man1/x11vnc.1*
+%{_datadir}/x11vnc/classes
 
 %changelog
+* Fri Aug 19 2005 Alberto Lusiani <alusiani@gmail.com> release 2
+- create separate package for x11vnc to prevent conflicts with x11vnc rpm
+- create devel package, needed to compile but not needed for running
 * Sun Feb 9 2003 Johannes Schindelin
 - created libvncserver.spec.in