commit mfsm for openSUSE:Factory
Hello community, here is the log from the commit of package mfsm for openSUSE:Factory checked in at 2013-07-26 15:51:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mfsm (Old) and /work/SRC/openSUSE:Factory/.mfsm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mfsm" Changes: -------- --- /work/SRC/openSUSE:Factory/mfsm/mfsm.changes 2013-07-19 17:20:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mfsm.new/mfsm.changes 2013-07-26 15:51:10.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 26 09:06:31 UTC 2013 - tchvatal@suse.com + +- Fix build on factory and cleanup the specfile + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mfsm.spec ++++++ --- /var/tmp/diff_new_pack.tgXqWQ/_old 2013-07-26 15:51:10.000000000 +0200 +++ /var/tmp/diff_new_pack.tgXqWQ/_new 2013-07-26 15:51:10.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package mfsm (Version 1.4) +# spec file for package mfsm # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,18 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: mfsm -BuildRequires: openmotif openmotif-devel update-desktop-files -License: ISC -Group: System/Monitoring -AutoReqProv: on +BuildRequires: imake +BuildRequires: openmotif +BuildRequires: openmotif-devel +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xpm) Url: http://members.tripod.com/SDHEngSoft/mfsm.html Version: 1.4 -Release: 475 +Release: 0 Summary: X Window System Based du +License: ISC +Group: System/Monitoring Source: %{name}-%{version}.tar.bz2 Source1: %{name}.desktop Patch: %{name}-%{version}.patch @@ -37,20 +39,8 @@ X Window Motif utility that monitors free space and user quotas of file systems. -%define _xorg7libs %_lib -%define _xorg7libs32 lib -%define _xorg7bin bin -%define _xorg7_mandir %_mandir -%define _xorg7pixmaps include -%define _xorg7libshare share -%define _xorg7_xkb /usr/share/X11/xkb -%define _xorg7_termcap /usr/lib/X11/etc -%define _xorg7_serverincl /usr/include/xorg -%define _xorg7_fonts /usr/share/fonts -%define _xorg7_prefix /usr - %prep -%setup -q -n %{name}-%{version} +%setup -q %patch %patch1 @@ -58,30 +48,20 @@ xmkmf -a test -x /usr/sbin/switch_motif_linking && \ /usr/sbin/switch_motif_linking dynamic -make CCOPTIONS="$RPM_OPT_FLAGS" LDFLAGS="-L/usr/%{_xorg7libs}" -#mv mfsm mfsm.SuSE-dynamic -#test -x /usr/sbin/switch_motif_linking && \ -# /usr/sbin/switch_motif_linking static -#make LDFLAGS="-L/usr/X11R6/lib" -#mv mfsm mfsm.SuSE-static -#make +make CCOPTIONS="$RPM_OPT_FLAGS" LDFLAGS="-L%_libdir" %{?_smp_mflags} %install -mkdir -p $RPM_BUILD_ROOT/usr/%{_xorg7bin} -mkdir -p $RPM_BUILD_ROOT/%{_xorg7_mandir}/man1 -install -m 0755 mfsm $RPM_BUILD_ROOT/usr/%{_xorg7bin} -install -m 0644 mfsm._man $RPM_BUILD_ROOT/%{_xorg7_mandir}/man1/mfsm.1x -#install -m 0755 mfsm.SuSE-static /usr/%{_xorg7bin} -#ln -s /usr/%{_xorg7bin}/mfsm.SuSE-static /usr/%{_xorg7bin}/mfsm +mkdir -p %buildroot%_bindir +mkdir -p %buildroot/%_mandir/man1 +install -m 0755 mfsm %buildroot/%_bindir +install -m 0644 mfsm._man %buildroot/%_mandir/man1/mfsm.1x %suse_update_desktop_file -i %name System Filesystem %files %defattr(-,root,root) -/usr/share/applications/%name.desktop -/usr/%{_xorg7bin}/mfsm -#/usr/%{_xorg7bin}/mfsm.SuSE-dynamic -#/usr/%{_xorg7bin}/mfsm.SuSE-static -%doc %{_xorg7_mandir}/man1/mfsm.1x.gz +%_datadir/applications/%name.desktop +%_bindir/mfsm +%doc %_mandir/man1/mfsm.1x.gz %doc README THANKS TODO FIXES %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de