Hello community,
here is the log from the commit of package xiterm for openSUSE:Factory checked
in at 2012-01-27 21:27:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xiterm (Old)
and /work/SRC/openSUSE:Factory/.xiterm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xiterm", Maintainer is "pgaj...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xiterm/xiterm.changes 2011-11-24
11:37:57.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.xiterm.new/xiterm.changes 2012-01-27
21:28:04.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Jan 27 10:52:48 UTC 2012 - pgaj...@suse.com
+
+- build with asneeded
+ * asneeded-and-dso.patch
+
+-------------------------------------------------------------------
New:
----
xiterm-asneeded-and-dso.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xiterm.spec ++++++
--- /var/tmp/diff_new_pack.Bu6Xk9/_old 2012-01-27 21:28:05.000000000 +0100
+++ /var/tmp/diff_new_pack.Bu6Xk9/_new 2012-01-27 21:28:05.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xiterm
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,9 +16,14 @@
#
-
Name: xiterm
-BuildRequires: fribidi-devel gtk2-devel libtool ncurses-devel
update-desktop-files xorg-x11 xorg-x11-devel
+BuildRequires: fribidi-devel
+BuildRequires: gtk2-devel
+BuildRequires: libtool
+BuildRequires: ncurses-devel
+BuildRequires: update-desktop-files
+BuildRequires: xorg-x11
+BuildRequires: xorg-x11-devel
%if 0%{?suse_version} > 1130
BuildRequires: utempter-devel
%else
@@ -27,12 +32,9 @@
%define appdefdir /usr/share/X11
%define xincludes /usr/include
%define xlibraries /usr/%{_lib}
-License: IPL-1.0
-Group: System/X11/Terminals
-AutoReqProv: on
Provides: locale(xorg-x11:ja;ko;zh)
Version: 0.5.20040304
-Release: 275
+Release: 0
# cvs -d:pserver:anonym...@www.openi18n.org:/cvsroot login (no password to
login)
# cvs -d:pserver:anonym...@www.openi18n.org:/cvsroot co iterm
# tar jcvf iterm-0.5.20040304.tar.bz2 iterm
@@ -47,14 +49,16 @@
Patch6: fbiterm-devconsole.dif
Patch7: fbiterm-combine-optimize.patch
Patch8: xiterm-implicit-fortify-decl.patch
+Patch9: xiterm-asneeded-and-dso.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Internationalized Terminal Emulator for X11
+License: IPL-1.0
+Group: System/X11/Terminals
%description
Internationalized Terminal Emulator for X11
%package -n fbiterm
-License: IPL-1.0
Summary: Internationalized Terminal Emulator for Framebuffers
Group: System/X11/Terminals
Provides: locale(ja;ko;zh)
@@ -63,7 +67,6 @@
An internationalized terminal emulator for framebuffers.
%package -n gtkiterm
-License: IPL-1.0
Summary: Internationalized Terminal Emulator for GTK
Group: System/X11/Terminals
Provides: locale(gtk2:ja;ko;zh)
@@ -72,9 +75,8 @@
An internationalized terminal emulator for GTK.
%package -n libiterm
-License: IPL-1.0
-Group: System/Libraries
Summary: Internationalized Terminal Emulator Library
+Group: System/Libraries
%description -n libiterm
This is a portable library for internationalized terminal emulator. All
@@ -83,7 +85,6 @@
fore/background color and so on.
%package -n libiterm-devel
-License: IPL-1.0
Summary: Header files and development libraries for libiterm
Group: Development/Libraries/Other
Requires: libiterm = %{version}
@@ -92,15 +93,13 @@
Header files and development libraries for libiterm
%package -n libXiterm
-License: IPL-1.0
-Group: System/Libraries
Summary: Terminal emulator Xaw widget library based on libiterm
+Group: System/Libraries
%description -n libXiterm
Terminal emulator Xaw widget library based on libiterm
%package -n libXiterm-devel
-License: IPL-1.0
Summary: Header files and development libraries for libXiterm
Group: Development/Libraries/Other
Requires: libXiterm = %{version}
@@ -109,7 +108,7 @@
Header files and development libraries for libXiterm
%prep
-%setup0 -q -n iterm -a 1
+%setup -q -n iterm -a 1
%patch0 -p 1 -b .fontset
%patch1 -p 0
%patch2 -p 0 -b .intptr
@@ -119,6 +118,7 @@
%patch6 -p 0
%patch7
%patch8
+%patch9 -p1
find . -name CVS -type d | xargs rm -rf
find . -name .cvsignore -type f | xargs rm -f
find . -type f | xargs chmod u+w
@@ -128,10 +128,6 @@
done
%build
-# This package failed when testing with -Wl,-as-needed being default.
-# So we disable it here, if you want to retest, just delete this comment and
the line below.
-export SUSE_ASNEEDED=0
-%{?suse_update_config:%{suse_update_config -f lib unix/Xaw/lib unix/Xaw/src
unix/fbiterm }}
export CFLAGS="$RPM_OPT_FLAGS"
pushd lib
autoreconf --force --install
++++++ xiterm-asneeded-and-dso.patch ++++++
Index: iterm/unix/Xaw/src/Makefile.am
===================================================================
--- iterm.orig/unix/Xaw/src/Makefile.am
+++ iterm/unix/Xaw/src/Makefile.am
@@ -1,6 +1,6 @@
bin_PROGRAMS = xiterm
-xiterm_LDADD = -L$(libdir) @X_LIBS@ -lX11 -lXmu -lXaw -lXt -literm -lXiterm
+xiterm_LDADD = -L$(libdir) @X_LIBS@ -lXiterm -lX11 -lXmu -lXaw -lXt -literm
xiterm_SOURCES = popup_menu.c popup_menu.h xiterm.c
CPPFLAGS = -I$(includedir)
Index: iterm/unix/gtk/src/Makefile
===================================================================
--- iterm.orig/unix/gtk/src/Makefile
+++ iterm/unix/gtk/src/Makefile
@@ -8,7 +8,7 @@ all: $(TARGET)
$(OBJS): gtkiterm.c
$(CC) $(CFLAGS) -c -o $@ -I../lib `pkg-config --cflags gtk+-2.0` $<
$(TARGET): $(OBJS) ../lib/libgtkiterm.a
- gcc $(CFLAGS) -o gtkiterm gtkiterm.c -I../lib `pkg-config --cflags
--libs gtk+-2.0` ../lib/libgtkiterm.a -literm
+ gcc $(CFLAGS) -o gtkiterm gtkiterm.c -I../lib `pkg-config --cflags
--libs gtk+-2.0` ../lib/libgtkiterm.a -literm -lgdk-x11-2.0 -lpango-1.0
-lglib-2.0
../lib/libgtkiterm.a: ../lib/VTScreenView.c ../lib/gtkiterm.c
../lib/VTScreenView.h ../lib/gtkiterm.h
$(MAKE) -C ../lib
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
