Accepting request 52497 from Education

Accepted submit request 52497 from user anubisg1

OBS-URL: https://build.opensuse.org/request/show/52497
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/garlic?expand=0&rev=9
This commit is contained in:
Ruediger Oertel 2010-11-10 19:55:50 +00:00 committed by Git OBS Bridge
parent 22c08a20be
commit 67b5b739dc
2 changed files with 6 additions and 62 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Nov 8 13:21:56 UTC 2010 - coolo@novell.com
- remove support for pre-9.1
-------------------------------------------------------------------
Mon Sep 3 15:13:55 CEST 2007 - lmichnovic@suse.cz

View File

@ -33,7 +33,6 @@ 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
@ -46,32 +45,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
%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, and biological
macromolecules. It reads Brookhaven Protein Database (PDB) files.
Authors:
--------
Damir Zucic <zucic@pref.etfos.hr>
%prep
%setup -b 0
%setup -T -D -a 1
@ -83,11 +62,7 @@ chmod -x README favicon.ico tolower.script garlic.gif cookbook/garlic.gif precom
cd ..
%build
%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
mkdir -p $RPM_BUILD_ROOT/{usr/%{_xorg7bin},etc,%{_xorg7_mandir}/man1/}
@ -115,42 +90,6 @@ chmod 644 html/{README,bold_statement.html,docs.html,favicon.ico,garlic.gif,inde
/usr/share/pixmaps/garlic.xpm
%clean
[ -d %{buildroot} -a "%{buildroot}" != "" ] && rm -rf %{buildroot}
rm -rf %{buildroot}
%changelog
* Mon Sep 03 2007 lmichnovic@suse.cz
- fixed rpmlint errors: executable doc files
* Mon Sep 25 2006 lmichnovic@suse.cz
- update to version 1.6
* new rendering features
- create desktop file
* 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
- fixed missing needed file residues.pdb
* Fri Jan 06 2006 lmichnovic@suse.cz
- update to version 1.5
* Thu May 12 2005 meissner@suse.de
- use RPM_OPT_FLAGS
* Fri Jan 21 2005 postadal@suse.cz
- updated to version 1.4
* Thu Aug 12 2004 postadal@suse.cz
- updated to version 1.3
* Fri Mar 19 2004 postadal@suse.cz
- removed useless .xvpics directory
* Sat Jan 10 2004 adrian@suse.de
- build as user
* Mon Feb 03 2003 postadal@suse.cz
- updated to version 1.2
* now can create and edit molecular structures
* Thu Feb 28 2002 postadal@suse.cz
- fix file permits, moved man page
* Tue Feb 12 2002 postadal@suse.cz
- fix lib64
* Thu Jan 24 2002 postadal@suse.cz
- fix specfile
* Fri Jan 18 2002 postadal@suse.cz
- added package garlic-1.1