Author: wolvverine Date: Sun Oct 2 16:11:43 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- FHS
---- Files affected:
SPECS:
webCDwriter.spec (1.29 -> 1.30)
---- Diffs:
================================================================
Index: SPECS/webCDwriter.spec
diff -u SPECS/webCDwriter.spec:1.29 SPECS/webCDwriter.spec:1.30
--- SPECS/webCDwriter.spec:1.29 Sun Oct 2 15:10:11 2005
+++ SPECS/webCDwriter.spec Sun Oct 2 18:11:37 2005
@@ -1,8 +1,7 @@
# $Revision$, $Date$
#TODO:
# add certificate and compiling java client
-# FHS
-## XXX: FHS violation
+# XXX: FHS violation
# /var/CDWserver/{http,bin,exports} -->
/usr/share/CDWserver/{http,bin,exports}
# /var/CDWserver/export/Server/doc --> /usr/share/doc/CDWserver
# /var/CDWserver --> /var/lib/CDWserver
@@ -14,13 +13,13 @@
Summary(pl): Narzędzie do sieciowego nagrywania CD
Name: webCDwriter
Version: 2.7.2
-Release: 0.1
+Release: 0.2
License: GPL v2+
Group: Networking/Daemons
Source0:
http://joerghaeger.de/webCDwriter/download/%{name}-%{version}.tar.bz2
# Source0-md5: 88e97d83b172c646603323426d429065
#Source0:
http://haeger.homeip.net/download/%{version}/%{name}-%{version}.tar.bz2
-#Patch:
+Patch0: %{name}-FHS.patch
# Source0Download: http://joerghaeger.de/webCDwriter/TARs.html
URL: http://JoergHaeger.de/webCDwriter/
@@ -30,8 +29,6 @@
BuildRequires: automake
BuildRequires: binutils
BuildRequires: libstdc++-devel
-#BuildRequires: weird-mambo-jumbo-in-post-scriptlet
-#BuildRequires: FHS-fixes
BuildRequires: jdkgcj
Requires(pre): /bin/chown
@@ -88,8 +85,10 @@
%prep
%setup -q
+%patch0 -p1
%build
+
./configure --pam \
--group=%{CDWgroup} \
--user=%{CDWuser} \
@@ -99,8 +98,7 @@
# --nosCert= # Netscape Object Signing Certificate
# --sunCert= # certificate for the keytool from Sun
-# --debug
-# --doNotCompileCDWserver
+# --debug
%{__make}
@@ -110,7 +108,8 @@
install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_datadir}/CDWserver}
mv $RPM_BUILD_ROOT/etc/init.d/CDWserver
$RPM_BUILD_ROOT/etc/rc.d/init.d/CDWserver
-rm -rf %{_var}/CDWserver/export/Server/doc
+rm $RPM_BUILD_ROOT/%{_bindir}/CDWuninstall.sh
+
%clean
if [ ! -e $RPM_BUILD_ROOT/dev/ ]; then
rm -rf $RPM_BUILD_ROOT
@@ -141,29 +140,28 @@
/sbin/chkconfig --add CDWserver
fi
-# XX: FHS and packaging policy violations
+# XX: packaging policy violations
#make "setgid root copies" of cdrdao, cdrecord, mkisofs and readcd
#for tool in cdrdao cdrecord mkisofs readcd
#do
-# if [ ! -e %{_var}/CDWserver/bin/$tool ]; then
+# if [ ! -e %{_bindir}/CDWserver/bin/$tool ]; then
# if [ -e %{_bindir}/$tool ]; then
-# cp -af %{_bindir}/$tool %{_var}/CDWserver/bin/ || :
+# cp -af %{_bindir}/$tool %{_bindir}/CDWserver/bin/ || :
# else
-# cp -af /usr/local/bin/$tool %{_var}/CDWserver/bin/ 2>
/dev/null || :
+# cp -af /usr/local/bin/$tool %{_bindir}/CDWserver/bin/
2> /dev/null || :
# fi
# fi
-# if [ -e %{_var}/CDWserver/bin/$tool ]; then
-# %{__chown} root:%{CDWgroup} %{_var}/CDWserver/bin/$tool || :
-# %{__chmod} 4750 %{_var}/CDWserver/bin/$tool || :
+# if [ -e %{_bindir}/CDWserver/bin/$tool ]; then
+# %{__chown} root:%{CDWgroup} %{_bindir}/CDWserver/bin/$tool || :
+# %{__chmod} 4750 %{_bindir}/CDWserver/bin/$tool || :
# fi
# done
#move old projects files to new localization (FHS)
-
if [ -e /home/CDWserver/ ]; then
- echo "move project files to %{_var}/CDWserver/projects/..."
- cp /home/CDWserver/* %{_var}/CDWserver/projects/ 2> /dev/null || :
+ echo "move project files to %{_libdir}/CDWserver/projects/..."
+ cp /home/CDWserver/* %{_libdir}/CDWserver/projects/ 2> /dev/null || :
echo "use #rmdir /home/CDWserver/ to clear directory"
fi
@@ -210,7 +208,6 @@
%dir %attr(0700,%{CDWuser},%{CDWgroup}) %{_var}/log/CDWserver
%dir %attr(0700,%{CDWuser},%{CDWgroup}) %{_var}/spool/CDWserver
-%dir %{_var}/CDWserver
%dir %{_datadir}/CDWserver
%attr(4754, root, %{CDWgroup}) %{_bindir}/cdrecord-dummy
%attr(4754, root, %{CDWgroup}) %{_bindir}/cdrdao-dummy
@@ -229,48 +226,48 @@
%attr(755,root,root) %{_sbindir}/CDWserver
%attr(755,root,root) %{_sbindir}/CDWuseradd
-%dir %{_var}/CDWserver/bin
-%dir %{_var}/CDWserver/export
-%{_var}/CDWserver/export/*
-
-%dir %{_var}/CDWserver/http
-%config(noreplace) %{_var}/CDWserver/http/about.html
-%config(noreplace) %{_var}/CDWserver/http/config.html
-%dir %{_var}/CDWserver/http/config
-%{_var}/CDWserver/http/config/*
-%{_var}/CDWserver/http/default.css
-%{_var}/CDWserver/http/exampleProject.txt
-%config(noreplace) %{_var}/CDWserver/http/favicon.ico
-%config(noreplace) %{_var}/CDWserver/http/footer
-%config(noreplace) %{_var}/CDWserver/http/head*
-%config(noreplace) %{_var}/CDWserver/http/help*.html
-%config(noreplace) %{_var}/CDWserver/http/index*.html
-%config(noreplace) %{_var}/CDWserver/http/messages*
-%dir %{_var}/CDWserver/http/rcdrecord
-%{_var}/CDWserver/http/rcdrecord/*
-%config(noreplace) %{_var}/CDWserver/http/status*.html
-%config(noreplace) %{_var}/CDWserver/http/support*.html
-%{_var}/CDWserver/http/*.png
-%dir %{_var}/CDWserver/http/webCDcreator
-%config(noreplace) %{_var}/CDWserver/http/webCDcreator/*.html
-%config(noreplace) %{_var}/CDWserver/http/webCDcreator/*.jnlp
-%dir %{_var}/CDWserver/http/webCDcreator/4netscape
-%{_var}/CDWserver/http/webCDcreator/4netscape/*
-%dir %{_var}/CDWserver/http/webCDcreator/4plugin
-%{_var}/CDWserver/http/webCDcreator/4plugin/*
-%dir %{_var}/CDWserver/http/webCDcreator/4pluginRSA
-%{_var}/CDWserver/http/webCDcreator/4pluginRSA/*
-%dir %{_var}/CDWserver/http/webCDcreator/doc
-%{_var}/CDWserver/http/webCDcreator/doc/*
-%dir %{_var}/CDWserver/http/webCDcreator/help
-%{_var}/CDWserver/http/webCDcreator/help/*
-%dir %{_var}/CDWserver/http/webCDcreator/i18n
-%{_var}/CDWserver/http/webCDcreator/i18n/*
-%dir %{_var}/CDWserver/http/webCDcreator/icons
-%{_var}/CDWserver/http/webCDcreator/icons/*
-%dir %{_var}/CDWserver/http/webCDcreator/errors
-%{_var}/CDWserver/http/webCDcreator/errors/*.html
-%dir %attr(700, %{CDWuser}, %{CDWgroup}) %{_var}/CDWserver/projects
+%dir %{_bindir}/CDWserver/bin
+%dir %{_datadir}/CDWserver/export
+%{_datadir}/CDWserver/export/*
+
+%dir %{_datadir}/CDWserver/http
+%config(noreplace) %{_datadir}/CDWserver/http/about.html
+%config(noreplace) %{_datadir}/CDWserver/http/config.html
+%dir %{_datadir}/CDWserver/http/config
+%{_datadir}/CDWserver/http/config/*
+%{_datadir}/CDWserver/http/default.css
+%{_datadir}/CDWserver/http/exampleProject.txt
+%config(noreplace) %{_datadir}/CDWserver/http/favicon.ico
+%config(noreplace) %{_datadir}/CDWserver/http/footer
+%config(noreplace) %{_datadir}/CDWserver/http/head*
+%config(noreplace) %{_datadir}/CDWserver/http/help*.html
+%config(noreplace) %{_datadir}/CDWserver/http/index*.html
+%config(noreplace) %{_datadir}/CDWserver/http/messages*
+%dir %{_datadir}/CDWserver/http/rcdrecord
+%{_datadir}/CDWserver/http/rcdrecord/*
+%config(noreplace) %{_datadir}/CDWserver/http/status*.html
+%config(noreplace) %{_datadir}/CDWserver/http/support*.html
+%{_datadir}/CDWserver/http/*.png
+%dir %{_datadir}/CDWserver/http/webCDcreator
+%config(noreplace) %{_datadir}/CDWserver/http/webCDcreator/*.html
+%config(noreplace) %{_datadir}/CDWserver/http/webCDcreator/*.jnlp
+%dir %{_datadir}/CDWserver/http/webCDcreator/4netscape
+%{_datadir}/CDWserver/http/webCDcreator/4netscape/*
+%dir %{_datadir}/CDWserver/http/webCDcreator/4plugin
+%{_datadir}/CDWserver/http/webCDcreator/4plugin/*
+%dir %{_datadir}/CDWserver/http/webCDcreator/4pluginRSA
+%{_datadir}/CDWserver/http/webCDcreator/4pluginRSA/*
+%dir %{_datadir}/CDWserver/http/webCDcreator/doc
+%{_datadir}/CDWserver/http/webCDcreator/doc/*
+%dir %{_datadir}/CDWserver/http/webCDcreator/help
+%{_datadir}/CDWserver/http/webCDcreator/help/*
+%dir %{_datadir}/CDWserver/http/webCDcreator/i18n
+%{_datadir}/CDWserver/http/webCDcreator/i18n/*
+%dir %{_datadir}/CDWserver/http/webCDcreator/icons
+%{_datadir}/CDWserver/http/webCDcreator/icons/*
+%dir %{_datadir}/CDWserver/http/webCDcreator/errors
+%{_datadir}/CDWserver/http/webCDcreator/errors/*.html
+%dir %attr(700, %{CDWuser}, %{CDWgroup}) %{_var}/lib/CDWserver/projects
%files rcdrecord
%defattr(644,root,root,755)
@@ -284,6 +281,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.30 2005/10/02 16:11:37 wolvverine
+- FHS
+
Revision 1.29 2005/10/02 13:10:11 wolvverine
- up to 2.7.2
- TODO: FHS violation
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/webCDwriter.spec?r1=1.29&r2=1.30&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
