branding-altlinux-school-server-5.0-alt2: fix conflicts

branding.spec

@@ -9,7 +9,7 @@
 
 Name: branding-%brand-%theme
 Version: 5.0.0
-Release: alt1
+Release: alt2
 BuildArch: noarch
 
 BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu
@@ -112,7 +112,7 @@ Obsoletes: alt-license-%theme alt-notes-%theme
 Summary: Distribution license and release notes
 License: Distributable
 Group: Documentation
-Conflicts: alt-notes-children alt-notes-hpc alt-notes-junior alt-notes-junior-sj alt-notes-junior-sm alt-notes-school-server alt-notes-server-lite alt-notes-skif alt-notes-terminal 
+Conflicts: alt-notes-children alt-notes-hpc alt-notes-junior alt-notes-junior-sj alt-notes-junior-sm alt-notes-office-server alt-notes-server-lite alt-notes-skif alt-notes-terminal 
 Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-notes ";done )
 
 %description notes
@@ -142,7 +142,7 @@ Conflicts: indexhtml-school_lite
 Conflicts: indexhtml-school_master
 Conflicts: indexhtml-school_terminal
 Conflicts: indexhtml-small_business
-Conflicts: indexhtml-school-server
+Conflicts: indexhtml-office-server
 
 Requires: xdg-utils 
 Requires(post): indexhtml-common
@@ -302,5 +302,8 @@ echo $lang > lang
 %_desktopdir/*
 
 %changelog
+* Thu Aug 27 2009 Vitaly Kuznetsov <vitty@altlinux.ru> 5.0.0-alt2
+- Fix conflicts
+
 * Thu Aug 27 2009 Vitaly Kuznetsov <vitty@altlinux.ru> 5.0.0-alt1
 - Initial school server branding (from office server)