Merge branch 'default' into default-server

Conflicts:
	.gear-rules
This commit is contained in:
Alexandra Panyukova 2009-05-13 19:52:47 +04:00
commit 14d14b63f4
2 changed files with 3 additions and 3 deletions

View File

@ -1 +1 @@
tar: . name=branding-altlinux-office-server-@version@
tar: . name=branding

View File

@ -25,7 +25,7 @@ BuildRequires: ImageMagick fontconfig
Packager: Anton V. Boyarshinov <boyarsh at altlinux dot org>
Source: %name-%version.tar
Source: branding.tar
Group: Graphics
Summary: System/Base
@ -163,7 +163,7 @@ Requires(post): indexhtml-common
ALT Linux index.html welcome page.
%prep
%setup -q
%setup -n branding
%build