rpms/sagator/F-10 .cvsignore, 1.4, 1.5 import.log, 1.2, 1.3 sagator.spec, 1.3, 1.4 sources, 1.4, 1.5

[Ján ONDREJ]

Author: ondrejj

Update of /cvs/pkgs/rpms/sagator/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15250/F-10

Modified Files:
	.cvsignore import.log sagator.spec sources 
Log Message:
Upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sagator/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Jul 2008 14:12:07 -0000	1.4
+++ .cvsignore	18 Feb 2009 06:42:15 -0000	1.5
@@ -1 +1 @@
-sagator-1.1.1-0.beta1.tar.bz2
+sagator-1.1.1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sagator/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	10 Jul 2008 14:12:07 -0000	1.2
+++ import.log	18 Feb 2009 06:42:15 -0000	1.3
@@ -1,2 +1,3 @@
 sagator-1_1_0-1_fc9:HEAD:sagator-1.1.0-1.fc9.src.rpm:1215697760
 sagator-1_1_1-0_beta1_fc9:HEAD:sagator-1.1.1-0.beta1.fc9.src.rpm:1215699108
+sagator-1_1_1-1_fc10:F-10:sagator-1.1.1-1.fc10.src.rpm:1234939311


Index: sagator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sagator/F-10/sagator.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sagator.spec	10 Jul 2008 14:12:07 -0000	1.3
+++ sagator.spec	18 Feb 2009 06:42:15 -0000	1.4
@@ -5,34 +5,24 @@
 %define ANTISPAMS bogofilter,qsf
 %define CLAMAV_VERSION 0.92
 
-Summary:   SAGATOR - antivir/antispam gateway for smtp server
+Summary:   Antivir/antispam gateway for smtp server
 Name:      sagator
 Version:   1.1.1
-Release:   0.beta1%{?dist}
-Source:    http://www.salstar.sk/pub/antivir/snapshots/sagator-%{version}-0.beta1.tar.bz2
+Release:   1%{?dist}
+Source:    http://www.salstar.sk/pub/antivir/snapshots/sagator-%{version}.tar.bz2
 URL:       http://www.salstar.sk/sagator/
 License:   GPLv2+
 Group:     System Environment/Daemons
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python-devel >= 2.2.2, ed, gettext
-Obsoletes: sagator-libclamav <= 1.2.3
-Obsoletes: sagator-pydspam <= 0.9.1
+Requires:  %{name}-core = %{version}-%{release}
 Requires:  python >= 2.2.2, sed
+Requires:  spamassassin
 %if %_vendor == "suse"
-BuildRequires: aaa_base, python-xml, clamav >= %{CLAMAV_VERSION}
-Requires:  aaa_base, smtp_daemon, clamav >= %{CLAMAV_VERSION}
-%if 0%suse_version < 01030
-Requires:  python-ctypes
-%endif
+Requires:  clamav >= %{CLAMAV_VERSION}
 %else
-Requires(post): chkconfig
-Requires(preun): chkconfig
-Requires(preun): initscripts
-Requires:  initscripts, smtpdaemon, shadow-utils
 Requires:  clamav-lib >= %{CLAMAV_VERSION}
-BuildRequires: initscripts, logwatch, clamav-devel >= %{CLAMAV_VERSION}
-
 %endif
 
 %description
@@ -56,10 +46,36 @@
     * SQL database logging and configuration
     * simple chroot support
 
+%package core
+Summary:        Antivir/antispam gateway for smtp server, core files
+Group:          System Environment/Daemons
+Requires:       python >= 2.2.2, sed
+%if %_vendor == "suse"
+BuildRequires: aaa_base, python-xml, clamav >= %{CLAMAV_VERSION}
+Requires:  aaa_base, smtp_daemon
+%if 0%suse_version < 01030
+Requires:  python-ctypes
+%endif
+%else
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(preun): initscripts
+Requires:       initscripts, smtpdaemon, shadow-utils
+BuildRequires:  initscripts, logwatch, clamav-devel >= %{CLAMAV_VERSION}
+Requires: clamav-lib >= %{CLAMAV_VERSION}
+Requires: spamassassin
+%endif
+Obsoletes: sagator-libclamav <= 1.2.3
+Obsoletes: sagator-pydspam <= 0.9.1
+
+%description core
+SAGATOR's core files. You can use this package separatelly, if you do
+not to depend on other software, required by sagator.
+
 %package webq
 Summary:        SAGATOR's web quarantine access
 Group:          System Environment/Daemons
-Requires:       sagator = %{version}-%{release}, python-kid >= 0.9.5
+Requires:       sagator-core = %{version}-%{release}, python-kid >= 0.9.5
 BuildRequires:  python-kid
 
 %description webq
@@ -71,7 +87,7 @@
 %package        selinux
 Summary:        SELinux support for SAGATOR
 Group:          System Environment/Daemons
-Requires:       %{name} = %{version}
+Requires:       %{name}-core = %{version}-%{release}
 Requires(postun): policycoreutils, selinux-policy
 BuildRequires: selinux-policy-devel
 # SElinux directory and policy package
@@ -103,13 +119,13 @@
 mkdir -p %{buildroot}%{CHROOTDIR}/tmp/quarantine
 %find_lang %{name}
 
-%pre
+%pre core
 getent group vscan >/dev/null || groupadd -r vscan
 getent passwd vscan >/dev/null || \
 useradd -r -g vscan -d %{CHROOTDIR} -s /sbin/nologin -c "SAGATOR" vscan
 exit 0
 
-%post
+%post core
 touch %{_var}/lib/sagator-mkchroot
 if [ $1 = 2 ]; then # upgrade
   [ -f %{_sysconfdir}/sysconfig/sagator ] && . %{_sysconfdir}/sysconfig/sagator || true
@@ -127,7 +143,7 @@
   fi
 fi
 
-%preun
+%preun core
 if [ $1 = 0 ]; then # uninstall
   # stop service
   %{_initrddir}/sagator stop >/dev/null 2>&1
@@ -152,16 +168,20 @@
 fi
 %endif
 
-%triggerin -- sagator-webq,%{BASE_LIBS},%{ARCHIVERS},%{ANTIVIRS},%{ANTISPAMS}
+%triggerin core -- sagator-webq,%{BASE_LIBS},%{ARCHIVERS},%{ANTIVIRS},%{ANTISPAMS}
 touch %{_var}/lib/sagator-mkchroot
 
-%triggerpostun -- sagator-webq,%{BASE_LIBS},%{ARCHIVERS},%{ANTIVIRS},%{ANTISPAMS}
+%triggerpostun core -- sagator-webq,%{BASE_LIBS},%{ARCHIVERS},%{ANTIVIRS},%{ANTISPAMS}
 touch %{_var}/lib/sagator-mkchroot
 
 %clean
 rm -rf %{buildroot}
 
-%files -f filelist
+%files
+%defattr(-,root,root)
+# no files, this package just requires others
+
+%files core -f filelist
 %defattr(-,root,root)
 %config(noreplace) %verify(not md5 size mtime) %attr(640,root,vscan) %{_sysconfdir}/%{name}.conf
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sysconfig/%{name}
@@ -205,25 +225,35 @@
 %if %{install_sepolicy}
 %files selinux
 %defattr(-,root,root)   
+%dir %{_datadir}/%{name}/selinux
 %{sepolicy}
 %endif
 
 %changelog
-* Sun Feb 17 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.1.1-0.beta1
+* Wed Sep 17 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.1.1-1
+- core files moved to core packages, sagator package now requires clamav
+  and spamassassin
+- added selinux policy dir
+
+* Sun Feb 17 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.1.0-2
+- changed dependency from smtpdaemon to server(smtp)
+- reverted back previous change
+
+* Sun Feb 17 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.1.0-1
 - added libclamav module
 - added pydspam module
 - selinux module moved to separate subpackage
 
-* Fri Jan 3 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.0.0
+* Fri Jan 3 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.0.0-1
 - /var/spool/vscan replaced by CHROOTDIR macro
 - posttrans section moved to init script (start section)
 - more macros used
 
-* Thu Jan 3 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.0.0-0beta32
+* Thu Jan 3 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.0.0-2
 - clean buildroot before install
 - sagator.conf symlink is now relative
 
-* Fri Sep 7 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.0.0-0beta31
+* Fri Sep 7 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.0.0-1
 - sagator moved from /usr/lib to /usr/share
 
 * Fri Apr 13 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sagator/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Jul 2008 14:12:07 -0000	1.4
+++ sources	18 Feb 2009 06:42:15 -0000	1.5
@@ -1 +1 @@
-e26e2f7b126addf4ecc1c66a4e195a83  sagator-1.1.1-0.beta1.tar.bz2
+a8be96499866353a56d4b49b1c3c2cd2  sagator-1.1.1.tar.bz2