SPECS: amanda.spec - rel 4 - fixed bashizm in chg-zd-mtx - merged perl-serv...

[baggins]

Author: baggins                      Date: Thu May 15 13:42:27 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 4
- fixed bashizm in chg-zd-mtx
- merged perl-server to server package (curcular requirement)

---- Files affected:
SPECS:
   amanda.spec (1.173 -> 1.174) 

---- Diffs:

================================================================
Index: SPECS/amanda.spec
diff -u SPECS/amanda.spec:1.173 SPECS/amanda.spec:1.174
--- SPECS/amanda.spec:1.173	Wed May 14 17:35:07 2008
+++ SPECS/amanda.spec	Thu May 15 15:42:22 2008
@@ -10,7 +10,7 @@
 Summary(pl.UTF-8):	Sieciowo zorientowany system tworzenia kopii zapasowych
 Name:		amanda
 Version:	2.6.0
-Release:	3
+Release:	4
 License:	BSD
 Group:		Networking/Utilities
 Source0:	http://dl.sourceforge.net/amanda/%{name}-%{version}.tar.gz
@@ -166,19 +166,6 @@
 %description perl -l pl.UTF-8
 Wiązania perla dla Amandy.
 
-%package perl-server
-Summary:	Perl bindings for amanda server
-Summary(pl.UTF-8):	Wiązania perla dla serwera Amandy
-Group:		Networking/Utilities
-Requires:	%{name}-perl = %{version}-%{release}
-Requires:	%{name}-server = %{version}-%{release}
-
-%description perl-server
-Perl bindings for amanda server.
-
-%description perl-server -l pl.UTF-8
-Wiązania perla dla serwera Amandy.
-
 %prep
 %setup -q
 %patch0 -p1
@@ -481,6 +468,20 @@
 %{_mandir}/man8/amtoc.8*
 %{_mandir}/man8/amverify.8*
 %{_mandir}/man8/amverifyrun.8*
+
+%{perl_vendorarch}/Amanda/Changer.pm
+%{perl_vendorarch}/Amanda/Cmdline.pm
+%{perl_vendorarch}/Amanda/Device.pm
+%{perl_vendorarch}/Amanda/Logfile.pm
+%{perl_vendorarch}/Amanda/Tapefile.pm
+%dir %{perl_vendorarch}/auto/Amanda/Cmdline
+%dir %{perl_vendorarch}/auto/Amanda/Device
+%dir %{perl_vendorarch}/auto/Amanda/Logfile
+%dir %{perl_vendorarch}/auto/Amanda/Tapefile
+%attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Cmdline/*.so
+%attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Device/*.so
+%attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Logfile/*.so
+%attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Tapefile/*.so
 %endif
 
 %if %{with client}
@@ -534,28 +535,17 @@
 %attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Types/*.so
 %attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Util/*.so
 
-%files perl-server
-%defattr(644,root,root,755)
-%{perl_vendorarch}/Amanda/Changer.pm
-%{perl_vendorarch}/Amanda/Cmdline.pm
-%{perl_vendorarch}/Amanda/Device.pm
-%{perl_vendorarch}/Amanda/Logfile.pm
-%{perl_vendorarch}/Amanda/Tapefile.pm
-%dir %{perl_vendorarch}/auto/Amanda/Cmdline
-%dir %{perl_vendorarch}/auto/Amanda/Device
-%dir %{perl_vendorarch}/auto/Amanda/Logfile
-%dir %{perl_vendorarch}/auto/Amanda/Tapefile
-%attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Cmdline/*.so
-%attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Device/*.so
-%attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Logfile/*.so
-%attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Tapefile/*.so
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.174  2008-05-15 13:42:22  baggins
+- rel 4
+- fixed bashizm in chg-zd-mtx
+- merged perl-server to server package (curcular requirement)
+
 Revision 1.173  2008-05-14 15:35:07  baggins
 - moved libdir/amanda/application to client
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/amanda.spec?r1=1.173&r2=1.174&f=u