Hello community, here is the log from the commit of package garlic checked in at Fri Aug 11 15:48:32 CEST 2006. -------- --- garlic/garlic.changes 2006-01-25 21:36:06.000000000 +0100 +++ garlic/garlic.changes 2006-08-11 10:17:37.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 11 10:16:17 CEST 2006 - lmichnovic@suse.cz + +- builds also with X.org 7.x, checks prefix in X.org +- specifying libpath in spec file, not in Makefile (libpath.patch) + +------------------------------------------------------------------- New: ---- garlic-1.5-libpath.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ garlic.spec ++++++ --- /var/tmp/diff_new_pack.bAnRQ1/_old 2006-08-11 15:48:16.000000000 +0200 +++ /var/tmp/diff_new_pack.bAnRQ1/_new 2006-08-11 15:48:16.000000000 +0200 @@ -5,7 +5,7 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -17,18 +17,46 @@ URL: http://www.ccp14.ac.uk/ccp/web-mirrors/garlic/garlic/ Autoreqprov: on Version: 1.5 -Release: 1 -Summary: Molecular Graphics Visualization tool +Release: 13 +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 BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if "%(xft-config --prefix)" == "/usr" +%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 +%else +%define _xorg7libs X11R6/%_lib +%define _xorg7libs32 X11R6/lib +%define _xorg7bin X11R6/bin +%define _xorg7_mandir /usr/X11R6/man +%define _xorg7pixmaps X11R6/include +%define _xorg7libshare X11R6/lib/ +%define _xorg7_xkb /etc/X11/xkb +%define _xorg7_termcap /usr/X11R6/lib/X11/etc +%define _xorg7_serverincl /usr/X11R6/lib/Server/include +%define _xorg7_fonts /usr/X11R6/lib/X11/fonts +#%define _xorg7_config /usr/X11R6/lib/X11/config #use libshare macro +%define _xorg7_prefix /usr/X11R6 +%endif %description Garlic is an X Window System tool intended for the molecular -visualization of protein structure, DNA structure, biological -macromolecule. It reads Brookhaven Protein Database (PDB) files. +visualization of protein structure, DNA structure, and biological +macromolecules. It reads Brookhaven Protein Database (PDB) files. @@ -38,30 +66,34 @@ %prep %setup -b 0 -%patch -p 1 %setup -T -D -a 1 +%patch -p 1 +%patch1 %build -make CCOPT="$RPM_OPT_FLAGS" LIBPATH="-L/usr/X11R6/%{_lib}" +%if "%(xft-config --prefix)" == "/usr" +make %{?jobs:-j%jobs} CCOPT="$RPM_OPT_FLAGS" LIBPATH="-L/usr/%{_lib}" +%else +make %{?jobs:-j%jobs} CCOPT="$RPM_OPT_FLAGS" LIBPATH="-L/usr/X11R6/%{_lib}" +%endif %install -[ -d %{buildroot} -a "%{buildroot}" != "" ] && rm -rf %{buildroot} -mkdir -p $RPM_BUILD_ROOT/{usr/X11R6/bin,etc,/usr/X11R6/man/man1/} -cp -a garlic $RPM_BUILD_ROOT/usr/X11R6/bin/ +mkdir -p $RPM_BUILD_ROOT/{usr/%{_xorg7bin},etc,%{_xorg7_mandir}/man1/} +cp -a garlic $RPM_BUILD_ROOT/usr/%{_xorg7bin}/ cp -a .garlicrc $RPM_BUILD_ROOT/etc/garlicrc mkdir -p $RPM_BUILD_ROOT/usr/share/garlic cp -a residues.pdb $RPM_BUILD_ROOT/usr/share/garlic/residues.pdb mv %{name}-%{version} html -install -m 644 %{S:2} $RPM_BUILD_ROOT/usr/X11R6/man/man1/ +install -m 644 %{S:2} $RPM_BUILD_ROOT/%{_xorg7_mandir}/man1/ rm -rf html/source html/mouse/.xvpics chmod 644 html/{README,bold_statement.html,docs.html,favicon.ico,garlic.gif,index.html,monster.gif,versions.html} %files %defattr(-,root,root) %doc html 1mal.script 2fcp.script 2omf.script 2por.script BUGS COPYING ENVIRONMENT HISTORY INSTALL README TODO -%doc /usr/X11R6/man/man1/* +%doc %{_xorg7_mandir}/man1/* %config /etc/garlicrc -/usr/X11R6/bin/%{name} +/usr/%{_xorg7bin}/%{name} /usr/share/garlic /usr/share/garlic/residues.pdb @@ -69,6 +101,9 @@ [ -d %{buildroot} -a "%{buildroot}" != "" ] && rm -rf %{buildroot} %changelog -n garlic +* Fri Aug 11 2006 - lmichnovic@suse.cz +- builds also with X.org 7.x, checks prefix in X.org +- specifying libpath in spec file, not in Makefile (libpath.patch) * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Fri Jan 13 2006 - lmichnovic@suse.cz ++++++ garlic-1.5-libpath.patch ++++++ --- Makefile +++ Makefile @@ -8,7 +8,7 @@ HEADERS = defines.h typedefs.h -LIBPATH = -L/usr/X11R6/lib +LIBPATH = LINKOPT = -lX11 -lm ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...