Merge branch 'master' of pc18:/srv/git/r/doldaconnect

diff --git a/autopackage/dcuilib.apspec.in b/autopackage/dcuilib.apspec.in
index da8653b..af911ba 100644 (file)
--- a/autopackage/dcuilib.apspec.in
+++ b/autopackage/dcuilib.apspec.in
@@ -20,6 +20,7 @@ The Dolda Connect interface library is used by programs for talking
 with the Dolda Connect daemon.
 
 [BuildPrepare]
+echo "apkg" >source
 prepareBuild --without-krb5 --disable-daemon --without-gtk2
 
 [BuildUnprepare]

diff --git a/autopackage/dolcon.apspec.in b/autopackage/dolcon.apspec.in
index ef45655..3e11773 100644 (file)
--- a/autopackage/dolcon.apspec.in
+++ b/autopackage/dolcon.apspec.in
@@ -30,6 +30,7 @@ it is the daemon that does that. This program only controls the
 daemon.
 
 [BuildPrepare]
+echo "apkg" >source
 prepareBuild --enable-gtk2ui --disable-daemon --disable-dolconf --disable-guishell
 
 [BuildUnprepare]

diff --git a/autopackage/doldacond.apspec.in b/autopackage/doldacond.apspec.in
index 5644e0f..ffa13dc 100644 (file)
--- a/autopackage/doldacond.apspec.in
+++ b/autopackage/doldacond.apspec.in
@@ -28,6 +28,7 @@ Note that, unless you really want to talk to the daemon using telnet,
 you will also want a user interface program to control it.
 
 [BuildPrepare]
+echo "apkg" >source
 prepareBuild --without-gtk2 --without-krb5 --without-keyutils --without-pam
 
 [BuildUnprepare]

diff --git a/autopackage/guishell.apspec.in b/autopackage/guishell.apspec.in
index 1d0b058..3a65484 100644 (file)
--- a/autopackage/guishell.apspec.in
+++ b/autopackage/guishell.apspec.in
@@ -15,6 +15,7 @@ AutopackageTarget: 1.2
 PackageFileName: doldaconnect-guishell-@VERSION@.package
 
 [BuildPrepare]
+echo "apkg" >source
 prepareBuild --enable-dolconf --enable-guishell --disable-gtk2ui --disable-daemon
 
 [BuildUnprepare]

diff --git a/configure.in b/configure.in
index 23ee9d5..4f35321 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -270,6 +270,7 @@ config/Makefile
 config/cmd/Makefile
 config/util/Makefile
 contrib/Makefile
+contrib/doldaconnect.spec
 share/Makefile
 autopackage/doldacond.apspec
 autopackage/dolcon.apspec

diff --git a/contrib/.gitignore b/contrib/.gitignore
new file mode 100644 (file)
index 0000000..612654b
--- /dev/null
+++ b/contrib/.gitignore
@@ -0,0 +1 @@
+*.spec

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index a985bbc..e60f5b1 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,2 +1,2 @@
 EXTRA_DIST =   gentoo-init.d-doldacond \
-               pam.d-doldacond
+               pam.d-doldacond doldaconnect.spec

diff --git a/contrib/doldaconnect.spec.in b/contrib/doldaconnect.spec.in
new file mode 100644 (file)
index 0000000..a21ab4c
--- /dev/null
+++ b/contrib/doldaconnect.spec.in
@@ -0,0 +1,105 @@
+# RPC specfile for Fedora
+Name:          doldaconnect
+Version:       @VERSION@
+Release:       1
+License:       GPL v2+
+Group:         Productivity/Networking/Other
+Summary:       Direct Connect client
+Source0:       http://www.dolda2000.com/~fredrik/doldaconnect/%{name}-%{version}.tar.gz
+URL:           http://www.dolda2000.com/~fredrik/doldaconnect/
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%description
+Dolda Connect is a client program for the Direct Connect peer-to-peer
+filesharing network. It is written so that the user interface is
+separated from the actual filesharing program, so that the user
+interface can run on a different computer over the network, and can be
+shut down temporarily (or only started temporarily), and can be
+replaced altogether.
+
+The protocol with which the user interface talks with the actual
+client is also quite well defined, so that other kinds of clients can
+be written as well, such as an automatic downloader, a chatbot,
+etc. It can also be used in secure multiuser operation.
+
+%package libs
+Summary:       %{name} libraries
+Group:         Libraries
+
+%description libs
+Shared libraries for %{name}.
+
+%package devel
+Summary:       Development files for %{name}.
+Group:         Development/Libraries
+
+%description devel
+Header files and development libraries for %{name}.
+
+%package -n doldacond
+Summary:       The daemon in %{name}.
+Group:         Daemons
+Requires(post,preun):  /sbin/chkconfig
+Requires:      rc-scripts
+
+%description -n doldacond
+Daemon for %{name} that does all the actual work of filesharing.
+
+%prep
+%setup
+
+%build
+%configure --disable-rpath --with-guile \
+               --enable-gtk2ui --enable-guishell --with-pam \
+               --with-krb5 --enable-gnomeapplet
+%{__make}
+
+%install
+rm -rf "$RPM_BUILD_ROOT"
+mkdir "$RPM_BUILD_ROOT"
+make install DESTDIR="$RPM_BUILD_ROOT"
+rm -f "$RPM_BUILD_ROOT"%{_libdir}/gaim/*.a
+
+%find_lang %{name}
+
+%clean
+rm -rf "$RPM_BUILD_ROOT"
+
+%post  libs -p /sbin/ldconfig
+%postun        libs -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root)
+%{_bindir}/dolcon
+%{_bindir}/dolconf
+%{_bindir}/dolcon-launch
+%{_bindir}/doldacond-shell
+%{_libdir}/bonobo/servers/*.server
+%{_libexecdir}/dolcon-trans-applet
+%{_desktopdir}/dolcon.desktop
+%{_iconsdir}/*
+%doc AUTHORS ChangeLog README doc/INSTALL doc/gui-shell doc/TODO doc/protorev
+
+%files libs
+%defattr(-,root,root)
+%{_libdir}/libdcui.so.1
+%{_libdir}/libdcui.so.1.1.0
+
+%files devel
+%defattr(-,root,root)
+${_libdir}/libdcui.so
+${_libdir}/libdcui.la
+%dir %{_includedir}/doldaconnect
+%{_includedir}/doldaconnect/*.h
+
+%files -n doldacond
+%dir %{_sysconfdir}
+%config(noreplace) %{_sysconfdir}/*
+%{_bindir}/doldacond
+%{_bindir}/locktouch
+%{_bindir}/tthsum
+%{_libexecdir}/speedrec
+
+%changelog
+* Tue Oct 16 2007 Fredrik Tolf <fredrik@dolda2000.com>
+- Initial spec files. Quite a lot taken from the PLD specfile.