[gq-commit] gq gq.spec.in,1.8,1.9

[<sta...@us...>]

Update of /cvsroot/gqclient/gq
In directory sc8-pr-cvs1:/tmp/cvs-serv16826

Modified Files:
	gq.spec.in 
Log Message:
* Applied a patch by Simon Matter <sim...@in...>
* Some small changes by me


Index: gq.spec.in
===================================================================
RCS file: /cvsroot/gqclient/gq/gq.spec.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gq.spec.in	28 Sep 2003 23:46:28 -0000	1.8
--- gq.spec.in	24 Oct 2003 19:21:04 -0000	1.9
***************
*** 1,2 ****
--- 1,3 ----
+ # -*- mode: rpm-spec -*-
  #
  # $Id$
***************
*** 30,38 ****
  %define _langpackversion_ %{!?langpackversion:@VERSION@}%{?langpackversion:%{langpackversion}}
  
! Name:		%name
  Summary:	Interactive graphical LDAP browser
! Version:	%version
! Release:	%release
! Copyright:	GPL
  Group:		Networking/Utilities
  URL:		http://biot.com/gq/
--- 31,39 ----
  %define _langpackversion_ %{!?langpackversion:@VERSION@}%{?langpackversion:%{langpackversion}}
  
! Name:		%{name}
  Summary:	Interactive graphical LDAP browser
! Version:	%{version}
! Release:	%{release}
! Copyright:	GPL with OpenSSL excemption
  Group:		Networking/Utilities
  URL:		http://biot.com/gq/
***************
*** 44,55 ****
  %endif
  
! BuildRoot:	/tmp/gq-%{version}-%{release}
  Requires:	gtk+ >= 1.2.0
  
  %description
! GQ is GTK+ LDAP client and browser utility. It can be used
  for searching a LDAP directory as well as browsing it using a
  tree view. Furthermore, it lets you inspect the LDAP schema a 
! server is using.
  
  %prep
--- 45,59 ----
  %endif
  
! BuildRoot:	%{_tmppath}/%{name}-%{version}-root
  Requires:	gtk+ >= 1.2.0
  
  %description
! GQ is a GTK+ LDAP client and browser utility. It can be used
  for searching a LDAP directory as well as browsing it using a
  tree view. Furthermore, it lets you inspect the LDAP schema a 
! server is using. 
! 
! Install gq if you need a graphical tool to manage the contents
! of a LDAP server.
  
  %prep
***************
*** 57,70 ****
  
  %if "%{_langpack_}" != "no"
!     tar -xzf %{SOURCE1}
      ./gq-%{_langpackversion_}-langpack-%{_langpack_}/langpack .
  %endif
  
  %build
! ./configure --with-included-gettext --prefix=%{prefix} #   --enable-cache --enable-browser-dnd
! make
  
  %install
! make DESTDIR=$RPM_BUILD_ROOT install-strip
  
  
--- 61,75 ----
  
  %if "%{_langpack_}" != "no"
! %setup -T -D -a 1
      ./gq-%{_langpackversion_}-langpack-%{_langpack_}/langpack .
  %endif
  
  %build
! %{configure} --with-included-gettext #   --enable-cache --enable-browser-dnd
! %{__make}
  
  %install
! [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
! %{makeinstall}
  
  
***************
*** 80,101 ****
  # by Simon Matter
  
! if [ "$RPM_BUILD_ROOT" != "/" ]; then
!     rm -rf $RPM_BUILD_ROOT/%{prefix}/share/locale
  fi
  
! %endif 
  
  %clean
! rm -rf $RPM_BUILD_ROOT
  
  %files
  %defattr(-, root, root)
! %{prefix}/bin/gq
! %{prefix}/share/gnome/apps/Internet/gq.desktop
! %dir %{prefix}/share/pixmaps/gq
! %{prefix}/share/pixmaps/gq/*
  
  %if "%{_langpack_}" != "no"
! %{prefix}/share/locale/*/LC_MESSAGES/*.mo
  %endif
  
--- 85,112 ----
  # by Simon Matter
  
! if [ "%{buildroot}" != "/" ]; then
!     %{__rm} -rf  %{buildroot}%{_datadir}/locale
  fi
  
! %else
! 
! # this file belongs to glibc-common, so we don't package it
! 
!     %{__rm} -f %{buildroot}%{_datadir}/locale/locale.alias
! 
! %endif
  
  %clean
! [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
  
  %files
  %defattr(-, root, root)
! %{_bindir}/*
! %{_datadir}/gnome/apps/Internet/%{name}.desktop
! %dir %{_datadir}/pixmaps/%{name}
! %{_datadir}/pixmaps/%{name}/*
  
  %if "%{_langpack_}" != "no"
! %{_datadir}/locale/*/LC_MESSAGES/*.mo
  %endif
  
***************
*** 114,119 ****
  
  %changelog
  * Thu Apr 25 2002 Peter Stamfest <pe...@st...>
! - Updated for I18N, added new enable arguments as a remainder
  
  * Mon Sep 25 2000 Bert Vermeulen <be...@bi...
--- 125,133 ----
  
  %changelog
+ * Wed Oct 22 2003 Simon Matter <sim...@in...>
+ - replaced several values by corresponding RPM macros
+ 
  * Thu Apr 25 2002 Peter Stamfest <pe...@st...>
! - Updated for I18N, added new enable arguments as a reminder
  
  * Mon Sep 25 2000 Bert Vermeulen <be...@bi...