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

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

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

Modified Files:
	gq.spec.in 
Log Message:
* Some fixes (RPM and langpack related)
* Added $Id$


Index: gq.spec.in
===================================================================
RCS file: /cvsroot/gqclient/gq/gq.spec.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** gq.spec.in	11 Oct 2002 14:14:25 -0000	1.7
--- gq.spec.in	28 Sep 2003 23:46:28 -0000	1.8
***************
*** 1,8 ****
! %define name @PACKAGE@
! %define version @VERSION@
! %define release 0
! %define langpack 0
  %define prefix /usr
  
  Name:		%name
  Summary:	Interactive graphical LDAP browser
--- 1,33 ----
! #
! # $Id$
! #
! 
! %define name     @PACKAGE@
! %define version  @VERSION@
! %define release  0
! 
  %define prefix /usr
  
+ # define langpack as "no" if you do not want to use a langpack
+ # you can do this either by uncommenting the following line and removing
+ # the first underscore within it:
+ #
+ #  %_define langpack no
+ # 
+ # or on the commandline of rpm using 
+ #
+ #  rpm -ba --define "langpack no" gq.spec
+ #
+ # The same works for tarball building
+ #
+ # If you want to use a specific langpack version you may define the
+ # langpack macro to another version in a way similar to as shown for "no"
+ #
+ # If you want to try a langpack from a different version of gq, you
+ # might to the same for the setting of the "langpackversion" macro.
+ 
+ %define _langpack_        %{!?langpack:@LANGPACK_VERSION@}%{?langpack:%{langpack}}
+ %define _langpackversion_ %{!?langpackversion:@VERSION@}%{?langpackversion:%{langpackversion}}
+ 
  Name:		%name
  Summary:	Interactive graphical LDAP browser
***************
*** 12,18 ****
  Group:		Networking/Utilities
  URL:		http://biot.com/gq/
! Packager:	Bert Vermeulen <be...@bi...>
  Source:		http://prdownloads.sourceforge.net/gqclient/gq-%{version}.tar.gz
! Source1:	http://prdownloads.sourceforge.net/gqclient/gq-%{version}-langpack-%{langpack}.tar.gz
  BuildRoot:	/tmp/gq-%{version}-%{release}
  Requires:	gtk+ >= 1.2.0
--- 37,47 ----
  Group:		Networking/Utilities
  URL:		http://biot.com/gq/
! Packager:	Peter Stamfest <pe...@st...>
  Source:		http://prdownloads.sourceforge.net/gqclient/gq-%{version}.tar.gz
! 
! %if "%{_langpack_}" != "no"
! Source1:	http://prdownloads.sourceforge.net/gqclient/gq-%{_langpackversion_}-langpack-%{_langpack_}.tar.gz
! %endif
! 
  BuildRoot:	/tmp/gq-%{version}-%{release}
  Requires:	gtk+ >= 1.2.0
***************
*** 20,30 ****
  %description
  GQ is GTK+ LDAP client and browser utility. It can be used
! for searching LDAP directory as well as browsing it using a
! tree view.
  
  %prep
! %setup
! tar -xzf %{SOURCE1}
! ./gq-%{version}-langpack-%{langpack}/langpack .
  
  %build
--- 49,63 ----
  %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
! %setup -q
! 
! %if "%{_langpack_}" != "no"
!     tar -xzf %{SOURCE1}
!     ./gq-%{_langpackversion_}-langpack-%{_langpack_}/langpack .
! %endif
  
  %build
***************
*** 35,38 ****
--- 68,89 ----
  make DESTDIR=$RPM_BUILD_ROOT install-strip
  
+ 
+ %if "%{_langpack_}" == "no"
+ 
+ cat >&2 <<EOF
+ No language pack selected for building - removing locale directory to
+ not confuse RPM and the find-lang script.
+ EOF
+ 
+ # arghhh, this fixes a problem with newer RPMs that complain when the
+ # directory exists, but does not contain any message catalogs. Reported
+ # by Simon Matter
+ 
+ if [ "$RPM_BUILD_ROOT" != "/" ]; then
+     rm -rf $RPM_BUILD_ROOT/%{prefix}/share/locale
+ fi
+ 
+ %endif 
+ 
  %clean
  rm -rf $RPM_BUILD_ROOT
***************
*** 44,48 ****
--- 95,103 ----
  %dir %{prefix}/share/pixmaps/gq
  %{prefix}/share/pixmaps/gq/*
+ 
+ %if "%{_langpack_}" != "no"
  %{prefix}/share/locale/*/LC_MESSAGES/*.mo
+ %endif
+ 
  
  %doc README