Hello community, here is the log from the commit of package hawk for openSUSE:Factory checked in at Thu Jul 14 17:18:52 CEST 2011.
-------- --- hawk/hawk.changes 2011-06-20 05:36:53.000000000 +0200 +++ hawk/hawk.changes 2011-07-13 16:33:18.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jul 13 14:31:12 UTC 2011 - [email protected] + +- Build hawk_invoke and hawk_chkpwd as position independent executables +- Fix missing %dir tags in spec file and an assortment of rpmlint warnings + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- build-fix-cib_test.patch build-fix-fsf-address.patch build-fix-hawk_invoke-implicit-decls.patch build-fix-pie.patch build-fix-rpm-opt-flags.patch hawk-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hawk.spec ++++++ --- /var/tmp/diff_new_pack.ye9ZTw/_old 2011-07-14 17:17:29.000000000 +0200 +++ /var/tmp/diff_new_pack.ye9ZTw/_new 2011-07-14 17:17:29.000000000 +0200 @@ -27,14 +27,21 @@ Name: hawk Summary: HA Web Konsole Version: 0.4.1 -Release: 1 +Release: 2 License: GPLv2 +Url: http://www.clusterlabs.org/wiki/Hawk Group: Productivity/Clustering/HA Source: %{name}-%{version}.tar.bz2 Source1: filter-requires.sh +Source100: hawk-rpmlintrc Patch1: string-unpack-s390x.patch Patch3: require-rack-1.1.patch Patch5: fix-rails-freeze-version_requirements.patch +Patch100: build-fix-fsf-address.patch +Patch101: build-fix-rpm-opt-flags.patch +Patch102: build-fix-hawk_invoke-implicit-decls.patch +Patch103: build-fix-pie.patch +Patch104: build-fix-cib_test.patch %define _use_internal_dependency_generator 0 %define __find_requires /bin/sh %{SOURCE1} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -42,6 +49,7 @@ Requires: pacemaker Requires: ruby Requires: lighttpd >= 1.4.20 +PreReq: permissions BuildRequires: rubygems BuildRequires: rubygem-rake BuildRequires: rubygem-gettext_rails @@ -60,8 +68,8 @@ %endif %description -A web-based GUI for monitoring the Pacemaker High-Availability cluster -resource manager +A web-based GUI for managing and monitoring the Pacemaker +High-Availability cluster resource manager. Authors: Tim Serong <[email protected]> @@ -72,8 +80,15 @@ %patch1 -p0 %patch3 -p0 %patch5 -p0 +%patch100 -p0 +%patch101 -p0 +%patch102 -p0 +%patch103 -p0 +%patch104 -p0 %build +CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}" +export CFLAGS make WWW_BASE=%{www_base} INIT_STYLE=%{init_style} LIBDIR=%{_libdir} BINDIR=%{_bindir} SBINDIR=%{_sbindir} %install @@ -104,7 +119,7 @@ rm -rf %{buildroot}%{www_base}/hawk/vendor/gems/*/samples rm -rf %{buildroot}%{www_base}/hawk/vendor/gems/*/test # 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) +# be "share/locale", not just "locale", and it also doesn't support appending to %%{name}.lang) %find_lang %{name} %{name}.lang %find_lang rgettext %{name}.lang %find_lang gettext_rails %{name}.lang @@ -113,6 +128,10 @@ # more cruft to clean up (WTF?) rm -f %{buildroot}%{www_base}/hawk/log/* find %{buildroot}%{www_base}/hawk/vendor/rails -type f -name '*.css' -o -name '*.js' -o -name '*LICENSE' | xargs chmod a-x +# get rid of packed gem specification files +rm -f %{buildroot}%{www_base}/hawk/vendor/gems/*/.specification +# likewise emtpy files (again, I say, WTF?) +find %{buildroot}%{www_base}/hawk/vendor -type f -empty | xargs rm # init script %{__install} -d -m 0755 \ %{buildroot}%{_sbindir} @@ -123,7 +142,13 @@ %clean rm -rf %{buildroot} +%verifyscript +%verify_permissions -e %{_sbindir}/hawk_chkpwd +%verify_permissions -e %{_sbindir}/hawk_invoke + %post +%set_permissions %{_sbindir}/hawk_chkpwd +%set_permissions %{_sbindir}/hawk_invoke %fillup_and_insserv hawk %preun @@ -160,9 +185,11 @@ %{www_base}/hawk/COPYING %{www_base}/hawk/script %{www_base}/hawk/test -# itemizing content in %{www_base}/hawk/vendor and locale to avoid +# itemizing content in %%{www_base}/hawk/vendor and locale to avoid # duplicate files that would otherwise be the result of including hawk.lang %dir %{www_base}/hawk/locale +%dir %{www_base}/hawk/locale/* +%dir %{www_base}/hawk/locale/*/* %dir %{www_base}/hawk/vendor %{www_base}/hawk/vendor/*rb # architecture-specific .so files @@ -173,8 +200,9 @@ %dir %{www_base}/hawk/vendor/gems/* %dir %{www_base}/hawk/vendor/gems/*/data %dir %{www_base}/hawk/vendor/gems/*/data/locale +%dir %{www_base}/hawk/vendor/gems/*/data/locale/* +%dir %{www_base}/hawk/vendor/gems/*/data/locale/*/* %{www_base}/hawk/vendor/gems/*/[!d]* -%{www_base}/hawk/vendor/gems/*/.specification %{www_base}/hawk/vendor/rails %{www_base}/hawk/vendor/rbconfig %{www_base}/hawk/vendor/rubygems ++++++ build-fix-cib_test.patch ++++++ Index: hawk/test/unit/cib_test.rb =================================================================== --- /dev/null +++ hawk/test/unit/cib_test.rb @@ -0,0 +1,8 @@ +require 'test_helper' + +class CibTest < ActiveSupport::TestCase + # Replace this with your real tests. + test "the truth" do + assert true + end +end ++++++ build-fix-fsf-address.patch ++++++ Index: scripts/hawk.suse.in =================================================================== --- scripts/hawk.suse.in.orig +++ scripts/hawk.suse.in @@ -14,10 +14,8 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Lesser General Public License for more details. # -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, -# USA. +# You should have received a copy of the GNU Lesser General Public License +# along with this library; if not, see <http://www.gnu.org/licenses/>. # # /etc/init.d/hawk # and its symbolic link ++++++ build-fix-hawk_invoke-implicit-decls.patch ++++++ Index: tools/hawk_invoke.c =================================================================== --- tools/hawk_invoke.c.orig +++ tools/hawk_invoke.c @@ -55,6 +55,7 @@ * */ +#define _GNU_SOURCE #include <unistd.h> #include <sys/types.h> #include <stdio.h> ++++++ build-fix-pie.patch ++++++ Index: Makefile =================================================================== --- Makefile.orig +++ Makefile @@ -73,7 +73,7 @@ all: scripts/hawk.$(INIT_STYLE) hawk/con $< > $@ tools/hawk_chkpwd: tools/hawk_chkpwd.c tools/common.h - gcc $(CFLAGS) -o $@ $< -lpam + gcc -fpie -pie $(CFLAGS) -o $@ $< -lpam tools/hawk_monitor: tools/hawk_monitor.c gcc $(CFLAGS) \ @@ -85,7 +85,7 @@ tools/hawk_monitor: tools/hawk_monitor.c # TODO(must): This is inching towards becoming annoying: want better build infrastructure/deps tools/hawk_invoke: tools/hawk_invoke.c tools/common.h - gcc $(CFLAGS) -o $@ $< + gcc -fpie -pie $(CFLAGS) -o $@ $< clean: rm -rf hawk/locale ++++++ build-fix-rpm-opt-flags.patch ++++++ Index: Makefile =================================================================== --- Makefile.orig +++ Makefile @@ -73,10 +73,10 @@ all: scripts/hawk.$(INIT_STYLE) hawk/con $< > $@ tools/hawk_chkpwd: tools/hawk_chkpwd.c tools/common.h - gcc -o $@ $< -lpam + gcc $(CFLAGS) -o $@ $< -lpam tools/hawk_monitor: tools/hawk_monitor.c - gcc \ + gcc $(CFLAGS) \ $(shell pkg-config --cflags glib-2.0) $(shell pkg-config --libs glib-2.0) \ $(shell pkg-config --cflags libxml-2.0) $(shell pkg-config --libs libxml-2.0) \ -I/usr/include/pacemaker -I/usr/include/heartbeat \ @@ -85,7 +85,7 @@ tools/hawk_monitor: tools/hawk_monitor.c # TODO(must): This is inching towards becoming annoying: want better build infrastructure/deps tools/hawk_invoke: tools/hawk_invoke.c tools/common.h - gcc -o $@ $< + gcc $(CFLAGS) -o $@ $< clean: rm -rf hawk/locale ++++++ hawk-rpmlintrc ++++++ addFilter("non-executable-script .*/srv/www/hawk/vendor/*") addFilter("script-without-shebang .*/srv/www/hawk/vendor/*") addFilter("wrong-script-end-of-line-encoding .*/srv/www/hawk/vendor/*") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
