Hello community, here is the log from the commit of package xcolors for openSUSE:Factory checked in at 2014-11-04 17:29:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xcolors (Old) and /work/SRC/openSUSE:Factory/.xcolors.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xcolors" Changes: -------- --- /work/SRC/openSUSE:Factory/xcolors/xcolors.changes 2011-09-23 12:51:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xcolors.new/xcolors.changes 2014-11-04 17:29:22.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Nov 2 00:42:45 UTC 2014 - [email protected] + +- Switch to individual pkgconfig() build requires + instead of using metapackage xorg-x11-devel + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xcolors.spec ++++++ --- /var/tmp/diff_new_pack.9hgRQY/_old 2014-11-04 17:29:23.000000000 +0100 +++ /var/tmp/diff_new_pack.9hgRQY/_new 2014-11-04 17:29:23.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package xcolors (Version 91.10.4 ) +# spec file for package xcolors # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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,51 +15,52 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - +%define _xorg7libs %{_lib} +%define _xorg7libs32 lib +%define _xorg7bin bin +%define _xorg7_mandir %{_mandir} +%define _xorg7pixmaps include +%define _xorg7libshare share Name: xcolors -BuildRequires: xorg-x11 xorg-x11-devel -License: SUSE-Public-Domain -Group: System/X11/Utilities -AutoReqProv: on Version: 91.10.4 -Release: 1225 +Release: 0 Summary: Displays colors defined in rgb.txt +License: SUSE-Public-Domain +Group: System/X11/Utilities Source: xcolors-04oct91.tar.bz2 -Patch: xcolors-04oct91.patch +Patch0: xcolors-04oct91.patch Patch1: xcolors-04oct91-xorg7_rgbtxt.patch +BuildRequires: imake +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xaw7) +BuildRequires: pkgconfig(xt) BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define _xorg7libs %_lib -%define _xorg7libs32 lib -%define _xorg7bin bin -%define _xorg7_mandir %_mandir -%define _xorg7pixmaps include -%define _xorg7libshare share %description Xcolorsel displays colors defined in rgb.txt. You can create an RGB file by redirecting the output of showrgb to a file. %prep -%setup -n xcolors-04oct91 -%patch +%setup -q -n xcolors-04oct91 +%patch0 %if "%(pkg-config --variable=prefix xft)" == "/usr" %patch1 %endif %build xmkmf -a -make %{?jobs:-j%jobs} CCOPTIONS="$RPM_OPT_FLAGS" +make %{?_smp_mflags} CCOPTIONS="%{optflags}" %install -make DESTDIR=$RPM_BUILD_ROOT install -make DESTDIR=$RPM_BUILD_ROOT install.man +make DESTDIR=%{buildroot} install %{?_smp_mflags} +make DESTDIR=%{buildroot} install.man %files %defattr(-,root,root) -/usr/%{_xorg7bin}/xcolors -%config /usr/%{_xorg7libshare}/X11/app-defaults/Xcolors +%{_prefix}/%{_xorg7bin}/xcolors +%dir %{_prefix}/%{_xorg7libshare}/X11/app-defaults +%config %{_prefix}/%{_xorg7libshare}/X11/app-defaults/Xcolors %doc %{_xorg7_mandir}/man1/xcolors.1x.gz %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
