Hello community,
here is the log from the commit of package garlic for openSUSE:Factory checked in at 2014-10-11 19:26:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/garlic (Old)
and /work/SRC/openSUSE:Factory/.garlic.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "garlic"
Changes:
--------
--- /work/SRC/openSUSE:Factory/garlic/garlic.changes 2011-10-06 16:02:31.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.garlic.new/garlic.changes 2014-10-11 19:28:47.000000000 +0200
@@ -1,0 +2,12 @@
+Fri Oct 10 06:42:48 UTC 2014 - jengelh@inai.de
+
+- Resolve rpmlint warnings files-duplicate, install-file-in-docs,
+ package-with-huge-docs, macro-in-comment.
+- Add garlic-1.6-undef.patch to fix rpmlint warning arraysubscript.
+
+-------------------------------------------------------------------
+Wed Oct 8 11:15:54 UTC 2014 - jengelh@inai.de
+
+- Enable parallel build and remove ancient specfile tags/sections
+
+-------------------------------------------------------------------
New:
----
garlic-1.6-undef.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ garlic.spec ++++++
--- /var/tmp/diff_new_pack.5AgF2s/_old 2014-10-11 19:28:48.000000000 +0200
+++ /var/tmp/diff_new_pack.5AgF2s/_new 2014-10-11 19:28:48.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package garlic
#
-# 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,24 +15,25 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: garlic
-BuildRequires: update-desktop-files xorg-x11 xorg-x11-devel
+Version: 1.6
+Release: 0
+Summary: Molecular Graphics Visualization Tool
License: LGPL-2.1+
Group: Productivity/Scientific/Chemistry
Url: http://www.ccp14.ac.uk/ccp/web-mirrors/garlic/garlic/
-AutoReqProv: on
-Version: 1.6
-Release: 203
-Summary: Molecular Graphics Visualization Tool
Source0: %{name}-%{version}.tar.bz2
Source1: %{name}-%{version}-doc.tar.bz2
Source2: %{name}.1.gz
Patch: %{name}-%{version}.patch
Patch1: garlic-%{version}-libpath.patch
+Patch2: garlic-1.6-undef.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: fdupes
+BuildRequires: update-desktop-files
+BuildRequires: xorg-x11
+BuildRequires: xorg-x11-devel
%define _xorg7libs %_lib
%define _xorg7libs32 lib
%define _xorg7bin bin
@@ -43,7 +44,6 @@
%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
%description
@@ -51,18 +51,32 @@
visualization of protein structure, DNA structure, and biological
macromolecules. It reads Brookhaven Protein Database (PDB) files.
+%package doc
+Summary: Documentation for Garlic, a molecular graphics visualization tool
+Group: Documentation/HTML
+%if 0%{?suse_version} >= 1120
+BuildArch: noarch
+%endif
+
+%description doc
+Garlic is an X Window System tool intended for the molecular
+visualization of protein structure, DNA structure, and biological
+macromolecules.
+This subpackage contains the full documentation to Garlic.
+
%prep
%setup -b 0
%setup -T -D -a 1
%patch -p 1
%patch1
+%patch2 -p 1
# fix executable permission on text files
cd garlic-1.6
chmod -x README favicon.ico tolower.script garlic.gif cookbook/garlic.gif precompiled_packages/garlic.gif
cd ..
%build
-make %{?jobs:-j%jobs} CC="%__cc" CCOPT="$RPM_OPT_FLAGS" LIBPATH="-L/usr/%{_lib}"
+make %{?_smp_mflags} CC="%__cc" CCOPT="$RPM_OPT_FLAGS" LIBPATH="-L/usr/%{_lib}"
%install
mkdir -p $RPM_BUILD_ROOT/{usr/%{_xorg7bin},etc,%{_xorg7_mandir}/man1/}
@@ -78,9 +92,19 @@
chmod 644 html/{README,bold_statement.html,docs.html,favicon.ico,garlic.gif,index.html,monster.gif,versions.html}
%suse_update_desktop_file -n -c %name "Garlic" Garlic garlic garlic Education Science Chemistry
+# Can't do this via %%doc in %%files, because that runs too late,
+# after %%fdupes.
+mkdir -p "%buildroot/%_defaultdocdir/%name"
+cp -a html 1mal.script 2fcp.script 2omf.script 2por.script \
+ BUGS COPYING ENVIRONMENT HISTORY README TODO \
+ "%buildroot/%_defaultdocdir/%name"
+
+%fdupes %buildroot/%_prefix
+
%files
%defattr(-,root,root)
-%doc html 1mal.script 2fcp.script 2omf.script 2por.script BUGS COPYING ENVIRONMENT HISTORY INSTALL README TODO
+%dir %_defaultdocdir/%name/
+%_defaultdocdir/%name/COPYING
%doc %{_xorg7_mandir}/man1/*
%config /etc/garlicrc
/usr/%{_xorg7bin}/%{name}
@@ -89,7 +113,9 @@
/usr/share/applications/%{name}.desktop
/usr/share/pixmaps/garlic.xpm
-%clean
-rm -rf %{buildroot}
+%files doc
+%defattr(-,root,root)
+%_defaultdocdir/%name/
+%exclude %_defaultdocdir/%name/COPYING
%changelog
++++++ garlic-1.6-undef.patch ++++++
Date: 2014-10-10 08:41:40.775804353 +0200
From: Jan Engelhardt