Hello community, here is the log from the commit of package hawk for openSUSE:Factory checked in at 2012-06-15 19:35:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hawk (Old) and /work/SRC/openSUSE:Factory/.hawk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hawk", Maintainer is "TSerong@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/hawk/hawk.changes 2012-05-03 10:57:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hawk.new/hawk.changes 2012-06-15 19:35:04.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 13 08:37:50 UTC 2012 - tserong@suse.com + +- Don't try to pack rubygems and ruby-fcgi for openSUSE 12.2 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hawk.spec ++++++ --- /var/tmp/diff_new_pack.aCDqks/_old 2012-06-15 19:35:06.000000000 +0200 +++ /var/tmp/diff_new_pack.aCDqks/_new 2012-06-15 19:35:06.000000000 +0200 @@ -49,6 +49,11 @@ Requires: graphviz-gd Requires: lighttpd >= 1.4.20 Requires: ruby +%if 0%{?suse_version} < 1220 +BuildRequires: ruby-fcgi +%else +Requires: rubygem-ruby-fcgi +%endif Recommends: graphviz-gnome BuildRequires: glib2-devel BuildRequires: libxml2-devel @@ -59,7 +64,6 @@ PreReq: permissions BuildRequires: fdupes BuildRequires: libpacemaker-devel -BuildRequires: ruby-fcgi BuildRequires: rubygem-rails-2_3 # Temporary, prevents confusion between rubygem-rack and rubygem-rack-1_3 BuildRequires: rubygem-rack < 1.3 @@ -105,6 +109,8 @@ make WWW_BASE=%{www_base} INIT_STYLE=%{init_style} DESTDIR=%{buildroot} install # copy of GPL cp COPYING %{buildroot}%{www_base}/hawk/ +%if 0%{?suse_version} < 1220 +# note: only doing evil magic pre-openSUSE 12.2 # evil magic to get ruby-fcgi into the vendor directory for f in $(rpm -ql ruby-fcgi|grep %{vendor_ruby}); do # gives something simliar to: @@ -124,10 +130,12 @@ mkdir -p %{buildroot}%{www_base}/hawk/vendor/$(dirname $r) cp $f %{buildroot}%{www_base}/hawk/vendor/$r done +%endif # get rid of gem sample and test cruft rm -rf %{buildroot}%{www_base}/hawk/vendor/gems/*/sample rm -rf %{buildroot}%{www_base}/hawk/vendor/gems/*/samples rm -rf %{buildroot}%{www_base}/hawk/vendor/gems/*/test +rm -rf %{buildroot}%{www_base}/hawk/vendor/gems/*/doc # mark .mo files as such (works on SUSE but not FC12, as the latter wants directory to # be "share/locale", not just "locale", and it also doesn't support appending to %%{name}.lang) %find_lang %{name} %{name}.lang @@ -203,9 +211,11 @@ %dir %{www_base}/hawk/locale/* %dir %{www_base}/hawk/locale/*/* %dir %{www_base}/hawk/vendor +%if 0%{?suse_version} < 1220 %{www_base}/hawk/vendor/*rb # architecture-specific .so files %{www_base}/hawk/vendor/*-linux +%endif # this is moderatly disgusting - the intent is to get everything except # the content of "data/locale" which is covered by files in hawk.lang %dir %{www_base}/hawk/vendor/gems @@ -216,8 +226,10 @@ %dir %{www_base}/hawk/vendor/gems/*/data/locale/*/* %{www_base}/hawk/vendor/gems/*/[!d]* %{www_base}/hawk/vendor/rails +%if 0%{?suse_version} < 1220 %{www_base}/hawk/vendor/rbconfig %{www_base}/hawk/vendor/rubygems +%endif %config(noreplace) %attr(-,root,root) %{_sysconfdir}/init.d/hawk %attr(-,root,root) %{_sbindir}/rchawk -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org