/[smeserver]/rpms/smeserver-support/sme8/smeserver-support.spec

Diff of /rpms/smeserver-support/sme8/smeserver-support.spec

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-Revision 1.19 by slords,
Mon Oct 13 22:17:14 2008 UTC
+Revision 1.36 by charliebrady,
Tue Jun 29 14:47:51 2010 UTC
 Line 1
- # $Id: smeserver-support.spec,v 1.18 2008/10/07 14:48:33 slords Exp $
+ # $Id: smeserver-support.spec,v 1.35 2010/06/28 15:33:08 charliebrady Exp $
  Summary: SME Server module to display support and licensing information
  %define name smeserver-support
  Name: %{name}
  %define version 2.2.0
- %define release 2
+ %define release 17
  # These packages come from CentOS, but wee need to use care when
  # updating them - either we've patched them, or we need to do something
  # prior to taking the update
  # TODO: check mkinitrd,mdadm to see if needed
- %define centos_excludes initscripts
+ %define centos_excludes initscripts,libgsf
+ %define centos_remove   kernel,kernel-smp,kernel-xenU,mkinitrd,mdadm
  Version: %{version}
  Release: %{release}%{?dist}
-Line 20 
 Group: Networking/Daemons
+Line 21 
 Group: Networking/Daemons
  Source: %{name}-%{version}.tar.gz
  Source1: smeserver_logo.jpg
  Source2: smeserver_logo.gif
+ Patch0: smeserver-support.bug5656.patch
+ Patch1: smeserver-support-2.2.0-migrate_excludes.patch
  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
  BuildRequires: e-smith-devtools >= 1.7.5
  BuildArchitectures: noarch
-Line 40 
 Obsoletes: kmod-slip
+Line 43 
 Obsoletes: kmod-slip
  Obsoletes: kmod-slip-smp
  Obsoletes: kmod-slip-xenU
+ # remove old kernel modules that prevent upgrades
+ Obsoletes: kernel-module-appletalk
+ Obsoletes: kernel-smp-module-appletalk
  # Old dependencies from outdated atrpms/rpmforge packages
  Obsoletes: libghttp
  Obsoletes: perl-HTTP-GHTTP
-Line 48 
 Obsoletes: pythonabi
+Line 55 
 Obsoletes: pythonabi
  # Remove packages no longer needed or provided in COS5
  Obsoletes: comps
+ Obsoletes: fonts-xorg-base
  Obsoletes: pine
  Obsoletes: system-config-keyboard
  Obsoletes: system-config-mouse
+ Obsoletes: VFlib2
  Obsoletes: xorg-x11-Mesa-libGL
  # remove netatalk and modules
-Line 68 
 Requires: audit-libs
+Line 77 
 Requires: audit-libs
  # New features that we want to pull in on upgrades
  Requires: smolt
- Requires: rkhunter
  Requires: screen
  Requires: smeserver-yum
  Obsoletes: yum = 1.0.3-6.0.7.x.esmith
-Line 100 
 Obsoletes: e-smith-samba = 2.1.0-10gjz
+Line 108 
 Obsoletes: e-smith-samba = 2.1.0-10gjz
  Requires: e-smith-samba
  # Pull in locales so we have a smooth language upgrade [SF: 1309520]
- #Requires: smeserver-locale-ca
  Requires: smeserver-locale-bg
  Requires: smeserver-locale-da
  Requires: smeserver-locale-de
  Requires: smeserver-locale-el
  Requires: smeserver-locale-es
+ Requires: smeserver-locale-et
  Requires: smeserver-locale-fr
+ Requires: smeserver-locale-he
  Requires: smeserver-locale-hu
  Requires: smeserver-locale-id
  Requires: smeserver-locale-it
  Requires: smeserver-locale-ja
+ Requires: smeserver-locale-nb
  Requires: smeserver-locale-nl
+ Requires: smeserver-locale-pl
  Requires: smeserver-locale-pt
  Requires: smeserver-locale-pt_BR
+ Requires: smeserver-locale-ro
+ Requires: smeserver-locale-ru
  Requires: smeserver-locale-sl
  Requires: smeserver-locale-sv
+ Requires: smeserver-locale-th
  Requires: smeserver-locale-tr
+ Requires: smeserver-locale-zh_CN
  # These should be re-pulled by other e-smith packages.
  Obsoletes: perl-File-MMagic = 1.22-1
-Line 174 
 Conflicts: e-smith-userpanel
+Line 189 
 Conflicts: e-smith-userpanel
  Obsoletes: dmc-mitel-mailrules
  Conflicts: dmc-mitel-mailrules
+ Obsoletes: php5-cgi
+ Conflicts: php5-cgi
+ Obsoletes: php5-cgi-imap
+ Conflicts: php5-cgi-imap
+ Obsoletes: php5-cgi-ldap
+ Conflicts: php5-cgi-ldap
+ Obsoletes: php5-cgi-mysql
+ Conflicts: php5-cgi-mysql
+ Obsoletes: php5-cgi-pear
+ Conflicts: php5-cgi-pear
+ Obsoletes: php5-cgi-xmlrpc
+ Conflicts: php5-cgi-xmlrpc
  # This block used to be in the SMEServer RPM. Many are probably
  # redundant or should be elsewhere or removed
  # [SF: 1356225]
-Line 235 
 Conflicts: dungog-ssl
+Line 263 
 Conflicts: dungog-ssl
  Conflicts: dungog-deletedoublebounce
  Conflicts: dungog-mailblocking
+ # Remove rkhunter
+ Obsoletes: rkhunter <= 1.3.4-7.el5.sme
  %changelog
+ * Tue Jun 29 2010 Charlie Brady <charlieb@budge.apana.org.au> 2.2.0-17.sme
+ - Add Obsoletes for php5-cgi-{imap,ldap,mysql,pear,xmlrpc}. [SME: 6089]
+ * Mon Jun 28 2010 Charlie Brady <charlieb@budge.apana.org.au> 2.2.0-16.sme
+ - Add Obsoletes for php5-cgi. [SME: 6089]
+ * Tue May 25 2010 Shad L. Lords <slords@mail.com> - 2.2.0-15.sme
+ - Add support for Hebrew (he). [SME: 5971]
+ * Mon May 17 2010 Shad L. Lords <slords@mail.com> 2.2.0-14.sme
+ - Add migrate fragment for centos excludes [SME: 5960]
+ * Mon May 17 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-13.sme
+ - Reverting previous change [SME: 5962]
+ * Mon May 17 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-12.sme
+ - Migrate CentOS Exclude property default values to smeserver-yum [SME: 5962]
+ * Wed Dec  9 2009 Charlie Brady <charlieb@budge.apana.org.au> 2.2.0-11.sme
+ - Fix css validation errors. [SME: 5656]
+ * Tue Oct 27 2009 Shad L. Lords <slords@mail.com> 2.2.0-10.sme
+ - Add support for Polish (pl). [SME: 5434]
+ - Add support for Thai (th). [SME: 5466]
+ * Mon Oct 26 2009 Shad L. Lords <slords@mail.com> 2.2.0-9.sme
+ - obsoletes fonts-xorg-base to prevent dragging in unneeded
+   packages [SME: 5535]
+ * Mon Oct 26 2009 Shad L. Lords <slords@mail.com> 2.2.0-8.sme
+ - add VFlib2 to obsoletes list so upgrades work [SME: 5532]
+ * Mon Aug 03 2009 Gavin Weight <gweight@gmail.com> 2.2.0-7.sme
+ - Add Obsoletes for kernel modules. [SME: 5386]
+ * Wed May 27 2009 Shad L. Lords <slords@mail.com> 2.2.0-6.sme
+ - Add support for Romanian (ro). [SME: 5268]
+ * Wed May 13 2009 Filippo Carletti <filippo.carletti@gmail.com> 2.2.0-5
+ - Obsoletes: rkhunter to remove from default install [SME: 5172]
+ * Wed Apr 29 2009 Gavin Weight <gweight@gmail.com> 2.2.0-4.sme
+ - Add support for Estonian (et). [SME: 5203]
+ * Tue Mar 3 2009 Shad L. Lords <slords@mail.com> 2.2.0-3.sme
+ - Add support for Norwegian Bokmal (nb) [SME: 5002 ]
+ - Add support for Russian (ru) [SME: 5002]
+ - Add support for Chinese China (zh_CN) [SME: 5002]
  * Mon Oct 13 2008 Shad L. Lords <slords@mail.com> 2.2.0-2.sme
  - Add support for Japanese (ja) [SME: 4637]
-Line 842 
 SME Server module to display support and
+Line 922 
 SME Server module to display support and
  %prep
  %setup
+ %patch0 -p1
+ %patch1 -p1
  cp %{SOURCE1} root/etc/e-smith/web/common
  cp %{SOURCE2} root/etc/e-smith/web/common
-Line 856 
 do
+Line 938 
 do
      mkdir -p $YUM_REPOS/defaults/$dir
      echo %{centos_excludes} > $YUM_REPOS/defaults/$dir/Exclude
  done
+ sed -i 's/CENTOS_EXCLUDES/%{centos_excludes}/' $YUM_REPOS/migrate/25CentOSExcludes
+ sed -i 's/CENTOS_REMOVE/%{centos_remove}/' $YUM_REPOS/migrate/25CentOSExcludes
  %install
  rm -rf $RPM_BUILD_ROOT

 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
-Removed lines/characters
+Added lines/characters

admin@koozali.org	ViewVC Help
Powered by ViewVC 1.2.1