rpms/gai/devel gai-0.5.10-nls.patch, NONE, 1.1 gai-0.5.9-pkgconfig.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gai.spec, 1.12, 1.13 sources, 1.3, 1.4 gai-0.5.8-gcc4.patch, 1.1, NONE gai-0.5.8-multilib.patch, 1.3, NONE gai-0.5.8-pkgconfig.patch, 1.1, NONE
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Tue Jun 28 01:29:17 UTC 2005
Author: mschwendt
Update of /cvs/extras/rpms/gai/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23131
Modified Files:
.cvsignore gai.spec sources
Added Files:
gai-0.5.10-nls.patch gai-0.5.9-pkgconfig.patch
Removed Files:
gai-0.5.8-gcc4.patch gai-0.5.8-multilib.patch
gai-0.5.8-pkgconfig.patch
Log Message:
* Tue Jun 28 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.10-1
- Update to 0.5.10, as preferences dialog was broken in 0.5.9.
- BR gettext, and pull in first .mo with %find_lang macro
- obsolete patches: multilib, gcc4
gai-0.5.10-nls.patch:
--- NEW FILE gai-0.5.10-nls.patch ---
diff -Nur gai-0.5.10-orig/configure gai-0.5.10/configure
--- gai-0.5.10-orig/configure 2005-06-26 09:01:36.000000000 +0200
+++ gai-0.5.10/configure 2005-06-28 02:59:32.000000000 +0200
@@ -2940,9 +2940,9 @@
echo "$as_me:$LINENO: checking whether to include nls support" >&5
echo $ECHO_N "checking whether to include nls support... $ECHO_C" >&6
-# Check whether --enable-rox or --disable-rox was given.
-if test "${enable_rox+set}" = set; then
- enableval="$enable_rox"
+# Check whether --enable-nls or --disable-nls was given.
+if test "${enable_nls+set}" = set; then
+ enableval="$enable_nls"
with_nls="$enableval"
else
with_nls=yes
diff -Nur gai-0.5.10-orig/configure.in gai-0.5.10/configure.in
--- gai-0.5.10-orig/configure.in 2005-06-12 09:48:54.000000000 +0200
+++ gai-0.5.10/configure.in 2005-06-28 02:59:34.000000000 +0200
@@ -86,7 +86,7 @@
with_nls=yes
AC_MSG_CHECKING(whether to include nls support)
-AC_ARG_ENABLE(rox, [ --disable-nls Compile the library without NLS support],
+AC_ARG_ENABLE(nls, [ --disable-nls Compile the library without NLS support],
[with_nls="$enableval"],
[with_nls=yes])
@@ -417,4 +417,4 @@
echo "It might be that the gai.pc file will be installed into a directory which"
echo "pkg-config doesn't know about(=you won't be able to install applets)."
echo "See README for help."
-fi
\ No newline at end of file
+fi
gai-0.5.9-pkgconfig.patch:
--- NEW FILE gai-0.5.9-pkgconfig.patch ---
To match ./gai/Makefile.in:
diff -Nur gai-0.5.9-orig/gai.pc.in gai-0.5.9/gai.pc.in
--- gai-0.5.9-orig/gai.pc.in 2005-04-02 10:57:08.000000000 +0200
+++ gai-0.5.9/gai.pc.in 2005-06-12 00:16:33.000000000 +0200
@@ -1,7 +1,7 @@
prefix=@prefix@
exec_prefix=${prefix}
-libdir=@libdir@/lib
-includedir=${prefix}/include
+libdir=@libdir@
+includedir=${prefix}/include/gai
gnome=@gnome_installed@
gl=@gl_installed@
rox=@with_rox@
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gai/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 27 Nov 2004 15:22:56 -0000 1.3
+++ .cvsignore 28 Jun 2005 01:29:14 -0000 1.4
@@ -1 +1 @@
-gai-0.5.8.tar.bz2
+gai-0.5.10.tar.bz2
Index: gai.spec
===================================================================
RCS file: /cvs/extras/rpms/gai/devel/gai.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gai.spec 11 Jun 2005 22:41:22 -0000 1.12
+++ gai.spec 28 Jun 2005 01:29:14 -0000 1.13
@@ -1,19 +1,18 @@
Name: gai
-Version: 0.5.8
-Release: 9%{?dist}
+Version: 0.5.10
+Release: 1%{?dist}
Summary: Generic Applet Interface
Group: User Interface/Desktops
License: LGPL
URL: http://gai.sourceforge.net
Source0: http://download.sf.net/gai/gai-%{version}.tar.bz2
-Patch0: gai-0.5.8-multilib.patch
-Patch1: gai-0.5.8-gcc4.patch
-Patch2: gai-0.5.8-pkgconfig.patch
+Patch0: gai-0.5.9-pkgconfig.patch
+Patch1: gai-0.5.10-nls.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libgnomeui-devel, gtk2-devel >= 2.2, gnome-panel-devel
-BuildRequires: SDL-devel gtkglext-devel
+BuildRequires: SDL-devel gtkglext-devel gettext
%package devel
Summary: Library and headers for Generic Applet Interface
@@ -24,7 +23,7 @@
%description
This library provides a generic interface for developing applets for Gnome 2
-and Windowmaker.
+and Windowmaker(Dockapps).
This is the package required to run precompiled GAI applets.
@@ -37,9 +36,8 @@
%prep
%setup -q
-%patch0 -p1 -b .multilib
-%patch1 -p1 -b .gcc4
-%patch2 -p1 -b .pkgconfig
+%patch0 -p1 -b .pkgconfig
+%patch1 -p1 -b .nls
%build
%ifarch x86_64
@@ -52,6 +50,7 @@
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=${RPM_BUILD_ROOT} install
+%find_lang %name
%clean
rm -rf $RPM_BUILD_ROOT
@@ -59,7 +58,7 @@
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%files
+%files -f %name.lang
%defattr(-,root,root,-)
%doc AUTHORS BUGS COPYING.LIB ChangeLog README* THANKS TODO WINDOWMANAGERS
%{_libdir}/libgai.so.*
@@ -72,6 +71,11 @@
%{_libdir}/libgai.so
%changelog
+* Tue Jun 28 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.10-1
+- Update to 0.5.10, as preferences dialog was broken in 0.5.9.
+- BR gettext, and pull in first .mo with %%find_lang macro
+- obsolete patches: multilib, gcc4
+
* Sun Jun 12 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.8-9
- Fix libdir and includedir in pkgconfig file.
- Disable ROX panel support explicitly.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gai/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 27 Nov 2004 15:22:56 -0000 1.3
+++ sources 28 Jun 2005 01:29:14 -0000 1.4
@@ -1 +1 @@
-29d90cb37fe5341009b27ffd09f871cb gai-0.5.8.tar.bz2
+1c9cf2fb24ae6c95412c60f256dc3513 gai-0.5.10.tar.bz2
--- gai-0.5.8-gcc4.patch DELETED ---
--- gai-0.5.8-multilib.patch DELETED ---
--- gai-0.5.8-pkgconfig.patch DELETED ---
More information about the fedora-extras-commits
mailing list