rpms/gq/devel gq-1.3.3.svn1161.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gq.spec, 1.7, 1.8 sources, 1.2, 1.3 gq-1.2.2-auth.patch, 1.1, NONE
Terje Røsten (terjeros)
fedora-extras-commits at redhat.com
Tue Feb 12 18:40:51 UTC 2008
Author: terjeros
Update of /cvs/extras/rpms/gq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21232
Modified Files:
.cvsignore gq.spec sources
Added Files:
gq-1.3.3.svn1161.patch
Removed Files:
gq-1.2.2-auth.patch
Log Message:
- Rebuild
- Add patch from svn to fix infinite loop
- Adjust buildreq
- Fix scrollkeeper stuff
- 1.3.3
- 1.3.2 from svn 2007-11-29
- Drop lang pack
- Drop auth patch (now upstream)
- Fix some %%doc files
- Install help docs and new icons
- Add gtk-update-icon-cache to %%post
gq-1.3.3.svn1161.patch:
--- NEW FILE gq-1.3.3.svn1161.patch ---
--- trunk/src/gq-formfill.c 2008/01/11 16:53:26 1160
+++ trunk/src/gq-formfill.c 2008/01/20 16:15:44 1161
@@ -750,7 +750,7 @@
struct berval **bervals = ldap_get_values_len(ld, res, attr);
struct berval **it;
- for(it = bervals; it && *it; it++) {
+ for(it = bervals, i=0; it && *it; it++, i++) {
GByteArray *gb = g_byte_array_new();
g_byte_array_append(gb,
(guchar*)(*it)->bv_val,
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gq/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 24 Nov 2006 18:59:53 -0000 1.2
+++ .cvsignore 12 Feb 2008 18:40:12 -0000 1.3
@@ -1,2 +1 @@
-gq-1.2.1-langpack-1.tar.gz
-gq-1.2.2.tar.gz
+gq-1.3.3.tar.gz
Index: gq.spec
===================================================================
RCS file: /cvs/extras/rpms/gq/devel/gq.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gq.spec 4 Dec 2007 19:24:14 -0000 1.7
+++ gq.spec 12 Feb 2008 18:40:12 -0000 1.8
@@ -1,22 +1,21 @@
-%define langver 1.2.1
-
Summary: Graphical LDAP directory browser and editor
-Name: gq
-Version: 1.2.2
-Release: 8%{?dist}
+Name: gq
+Version: 1.3.3
+Release: 3%{?dist}
License: GPLv2+
-Group: Applications/Internet
-URL: http://www.gq-project.org/
+Group: Applications/Internet
+URL: http://www.gq-project.org/
Source0: http://dl.sf.net/sourceforge/gqclient/%{name}-%{version}.tar.gz
-Source1: http://dl.sf.net/sourceforge/gqclient/%{name}-%{langver}-langpack-1.tar.gz
-Patch0: gq-1.2.1-desktop.patch
-Patch1: gq-1.2.2-auth.patch
-BuildRequires: libgcrypt-devel libglade2-devel
-BuildRequires: desktop-file-utils
-BuildRequires: gettext gnome-keyring-devel
+Patch0: gq-1.2.1-desktop.patch
+Patch1: gq-1.3.3.svn1161.patch
+BuildRequires: gtk2-devel libglade2-devel libgcrypt-devel
+BuildRequires: gnome-keyring-devel libxml2-devel
+Buildrequires: gettext desktop-file-utils gnome-doc-utils
BuildRequires: openldap-devel openssl-devel
BuildRequires: perl(XML::Parser)
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# for /usr/bin/iconv
+BuildRequires: glibc-common
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
GQ is a graphical browser for LDAP directories and schemas. Using GQ,
@@ -26,42 +25,57 @@
%prep
%setup -q
%patch -p1
-%patch1 -p2
-%setup -q -T -D -a 1
+%patch1 -p1
%build
-
-# Set up langpack
-%{name}-%{langver}-langpack-1/langpack .
-cp -p %{name}-%{langver}-langpack-1/po/LINGUAS po/
-
-%configure --with-included-gettext --disable-update-mimedb --with-default-codeset=UTF-8
-# --enable-cache --enable-browser-dnd
-
-make %{?_smp_mflags}
+%configure --with-included-gettext \
+ --disable-update-mimedb \
+ --with-default-codeset=UTF-8 \
+ --disable-scrollkeeper \
+ --enable-cache \
+ --enable-browser-dnd
+%{__make} %{?_smp_mflags}
+
+for f in TODO AUTHORS ChangeLog ; do
+ mv $f $f.iso88591
+ iconv -f ISO-8859-1 -t UTF-8 -o $f $f.iso88591
+ touch -r $f.iso88591 $f
+ rm -f $f.iso88591
+done
%install
-rm -rf %{buildroot}
-
-make install DESTDIR=%{buildroot}
-
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR=%{buildroot}
desktop-file-install --vendor fedora --delete-original \
--dir %{buildroot}%{_datadir}/applications \
%{buildroot}%{_datadir}/applications/%{name}.desktop
-
%find_lang %{name}
%clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
%post
update-mime-database %{_datadir}/mime &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+if [ -x %{_bindir}/scrollkeeper-update ]; then
+ %{_bindir}/scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+fi
%postun
update-mime-database %{_datadir}/mime &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+if [ -x %{_bindir}/scrollkeeper-update ]; then
+ %{_bindir}/scrollkeeper-update -q || :
+fi
%files -f %{name}.lang
-%defattr(-, root, root,-)
+%defattr(-, root, root, -)
%doc AUTHORS ChangeLog COPYING NEWS README* TODO
%{_bindir}/%{name}
@@ -70,10 +84,32 @@
%{_datadir}/pixmaps/%{name}/*.png
%{_datadir}/mime/packages/%{name}-ldif.xml
%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/omf/gq-manual
+%{_datadir}/gnome/help/gq-manual
+%{_datadir}/icons/hicolor/16x16/apps/ldap-*.png
%dir %{_datadir}/pixmaps/%{name}
%dir %{_datadir}/%{name}
%changelog
+* Tue Feb 12 2008 Terje Røsten <terje.rosten at ntnu.no> - 1.3.3-3
+- Rebuild
+
+* Mon Jan 21 2008 Terje Røsten <terje.rosten at ntnu.no> - 1.3.3-2
+- Add patch from svn to fix infinite loop
+- Adjust buildreq
+- Fix scrollkeeper stuff
+
+* Wed Jan 8 2008 Terje Røsten <terje.rosten at ntnu.no> - 1.3.3-1
+- 1.3.3
+
+* Thu Nov 29 2007 Terje Røsten <terje.rosten at ntnu.no> - 1.3.2-0.1.svn20071129
+- 1.3.2 from svn 2007-11-29
+- Drop lang pack
+- Drop auth patch (now upstream)
+- Fix some %%doc files
+- Install help docs and new icons
+- Add gtk-update-icon-cache to %%post
+
* Tue Nov 7 2007 Terje Røsten <terje.rosten at ntnu.no> - 1.2.2-8
- Rebuild for openssl and openldap
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gq/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 24 Nov 2006 18:59:53 -0000 1.2
+++ sources 12 Feb 2008 18:40:12 -0000 1.3
@@ -1,2 +1 @@
-9429d161c91e12d000c8b0c2f6e21d63 gq-1.2.1-langpack-1.tar.gz
-107d8a971c14b52b2bedbf3944840bea gq-1.2.2.tar.gz
+a8b1ba254a8fe10895e8e722612c535a gq-1.3.3.tar.gz
--- gq-1.2.2-auth.patch DELETED ---
More information about the fedora-extras-commits
mailing list