-Lots of changes. Arekm now your turn.;))

[packages/dqs.git] / dqs.spec

diff --git a/dqs.spec b/dqs.spec
index 00fd4457e72f224d8ca3bfb62be7d1249dbe1927..9b32997077120b66886ab8a8f3a6ffed13cea8c4 100644 (file)
--- a/dqs.spec
+++ b/dqs.spec
@@ -2,46 +2,65 @@ Summary:      Distributet Quening System
 Summary(pl):   System Rozproszonego Kolejkowania
 Name:          dqs
 Version:       3.3.2
-Release:       1
+Release:       2
 Group:         Applications/Networking
 Group(de):     Applikationen/Netzwerkwesen
 Group(pl):     Aplikacje/Sieciowe
 License:       GPL
-Source0:       ftp://ftp.csit.fsu.edu:/pub/pub/dqs/DQS-%{version}.tar.gz
+Source0:       ftp://ftp.csit.fsu.edu/pub/dqs/DQS-%{version}.tgz
 Source1:       %{name}-PLD-%{name}.h
 Source2:       %{name}-PLD-def.h
 Source3:       %{name}-PLD-resolve_file
-Source4:       %{name}-PLD-Makefile
-Source5:       %{name}-PLD-conf_file
-Source6:       %{name}-init
-Patch0:                %{name}-install.patch
+Source4:       %{name}-PLD-conf_file
+#Source6:      %{name}-init
+Patch0:                %{name}-DESTDIR.patch
+Patch1:                dqs-mq.patch
 URL:           http://www.scri.fsu.edu/~pasko/dqs.html
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%description
+%description 
 Distributed quening system
 
 %description -l pl
 System Rozproszonego Kolejkowania Zadañ.
 
+%package master
+Summary:        Distributet Quening System (Master server)
+Summary(pl):    System Rozproszonego Kolejkowania (Master server)
+Group:         Applications/Networking
+Group(de):     Applikationen/Netzwerkwesen
+Group(pl):     Aplikacje/Sieciowe
+Requires:       %{name} == %{verion}
+
+%description master 
+Distributed quening system. Master server.
+
+%description -l pl master
+System Rozproszonego Kolejkowania Zadañ. Master server.
+
+
+
 %prep
 %setup  -q -n DQS3
 cp %{SOURCE1} SRC/dqs.h
 cp %{SOURCE2} SRC/def.h
-cp %{SOURCE4} Makefile
+#cp %{SOURCE4} Makefile
 %patch0 -p1
+%patch1 -p1
 
 %build
+CFLAGS="$RPM_OPT_FLAGS" CC=gcc ; export CFLAGS CC
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make}  DESTDIR=$RPM_BUILD_ROOT installall
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 
 install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/resolve_file
-install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf_file
+install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf_file
 
+install -d $RPM_BUILD_ROOT%{_mandir}/man1
 install MAN/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
 
 install -d $RPM_BUILD_ROOT/var/spool/%{name}/common_dir
@@ -60,8 +79,13 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/* 
+%attr(755,root,root) %{_sbindir}/qconf332 
+%attr(755,root,root) %{_sbindir}/dqs_execd332
 %doc %{_mandir}/man1
 %doc %{_docdir}/%{name}-%{version}
 %dir /var/spool/%{name}/common_dir
 %dir /var/log/%{name}
 %attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/%{name}/*
+%files master
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/qmaster332