Hello community,
here is the log from the commit of package xbench for openSUSE:Factory checked
in at 2015-03-12 16:38:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xbench (Old)
and /work/SRC/openSUSE:Factory/.xbench.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xbench"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xbench/xbench.changes 2014-11-04
17:30:08.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.xbench.new/xbench.changes 2015-03-12
16:38:57.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Mar 11 13:32:34 UTC 2015 - mplus...@suse.com
+
+- Cleanup spec-file with spec-cleaner
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xbench.spec ++++++
--- /var/tmp/diff_new_pack.8H5huj/_old 2015-03-12 16:38:58.000000000 +0100
+++ /var/tmp/diff_new_pack.8H5huj/_new 2015-03-12 16:38:58.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xbench
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,17 @@
#
+%define _xorg7libs %{_lib}
+%define _xorg7libs32 lib
+%define _xorg7bin bin
+%define _xorg7_mandir %{_mandir}
+%define _xorg7pixmaps include
+%define _xorg7libshare share
+%define _xorg7_xkb %{_datadir}/X11/xkb
+%define _xorg7_termcap %{_libexecdir}/X11/etc
+%define _xorg7_serverincl %{_includedir}/xorg
+%define _xorg7_fonts %{_datadir}/fonts
+%define _xorg7_prefix /usr
Name: xbench
Version: 0.2
Release: 0
@@ -23,60 +34,48 @@
License: SUSE-Public-Domain
Group: System/Benchmark
Url: http://ftp.x.org/contrib/utilities/
-Source: http://ftp.x.org/contrib/utilities/%name-%version-src.tar.gz
-Patch: xbench-%{version}.patch
+Source:
http://ftp.x.org/contrib/utilities/%{name}-%{version}-src.tar.gz
+Patch0: xbench-%{version}.patch
Patch1: xbench-%{version}-ia64.patch
Patch2: xbench-%{version}-nonvoid.patch
Patch3: xbench-%{version}-gets.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: imake
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xext)
-%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_config /usr/share/X11/config #use libshare macro
-%define _xorg7_prefix /usr
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
A benchmark for X11.
%prep
%setup -q
-%patch
+%patch0
%patch1
%patch2
%patch3
%build
xmkmf -a
-make %{?_smp_mflags} CCOPTIONS="%optflags"
+make %{?_smp_mflags} CCOPTIONS="%{optflags}"
%install
-make "DESTDIR=$RPM_BUILD_ROOT" install
-make "DESTDIR=$RPM_BUILD_ROOT" install.man
-install -d $RPM_BUILD_ROOT%{_defaultdocdir}/xbench
-install -d $RPM_BUILD_ROOT/usr/%{_xorg7libshare}/X11/xbench/results
-install -d $RPM_BUILD_ROOT/usr/%{_xorg7libshare}/X11/xbench/scripts
+make "DESTDIR=%{buildroot}" install
+make "DESTDIR=%{buildroot}" install.man
+install -d %{buildroot}%{_defaultdocdir}/xbench
+install -d %{buildroot}%{_prefix}/%{_xorg7libshare}/X11/xbench/results
+install -d %{buildroot}%{_prefix}/%{_xorg7libshare}/X11/xbench/scripts
install -m 644 AUTHOR CHANGES IAFA-PACKAGE README xbench.doc Makefile
script.run \
- $RPM_BUILD_ROOT/usr/%{_xorg7libshare}/X11/xbench
-install -m 644 results/*
$RPM_BUILD_ROOT/usr/%{_xorg7libshare}/X11/xbench/results
-install -m 644 scripts/*
$RPM_BUILD_ROOT/usr/%{_xorg7libshare}/X11/xbench/scripts
-chmod a+x $RPM_BUILD_ROOT/usr/%{_xorg7libshare}/X11/xbench/scripts/insSep.sh
-cd $RPM_BUILD_ROOT%{_defaultdocdir}/xbench; ln -sf
../../../../%{_xorg7libshare}/X11/xbench benchmarks
+ %{buildroot}%{_prefix}/%{_xorg7libshare}/X11/xbench
+install -m 644 results/*
%{buildroot}%{_prefix}/%{_xorg7libshare}/X11/xbench/results
+install -m 644 scripts/*
%{buildroot}%{_prefix}/%{_xorg7libshare}/X11/xbench/scripts
+chmod a+x %{buildroot}%{_prefix}/%{_xorg7libshare}/X11/xbench/scripts/insSep.sh
+cd %{buildroot}%{_defaultdocdir}/xbench; ln -sf
../../../../%{_xorg7libshare}/X11/xbench benchmarks
%files
%defattr(-,root,root)
%doc %{_defaultdocdir}/xbench
%doc %{_xorg7_mandir}/man1/xbench.1x*
-/usr/%{_xorg7bin}/xbench
-/usr/%{_xorg7libshare}/X11/xbench
+%{_prefix}/%{_xorg7bin}/xbench
+%{_prefix}/%{_xorg7libshare}/X11/xbench
%changelog
++++++ xbench-0.2-gets.patch ++++++
--- /var/tmp/diff_new_pack.8H5huj/_old 2015-03-12 16:38:58.000000000 +0100
+++ /var/tmp/diff_new_pack.8H5huj/_new 2015-03-12 16:38:58.000000000 +0100
@@ -1,6 +1,8 @@
---- main.c
+Index: main.c
+===================================================================
+--- main.c.orig
+++ main.c
-@@ -181,18 +181,18 @@
+@@ -181,18 +181,18 @@ Display *dpy;
printf("\n");
fprintf(stderr, "describe brand/configuration of SERVER machine (1
line)\n");
fprintf(stderr, "(example: XYZ-891 with steam-engine [return]\n");
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
