From 16021fa60612573e786233e97b45a138c7edef18a5a7beeb9c1555ea7cba2e7d Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 5 Sep 2011 09:59:01 +0000 Subject: [PATCH] Accepting request 80535 from home:pgajdos - build with --no-copy-dt-needed-entries * no-copy-dt-needed-entries.patch OBS-URL: https://build.opensuse.org/request/show/80535 OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/fvwm2?expand=0&rev=13 --- fvwm-2.5.26-no-copy-dt-needed-entries.patch | 146 ++++++++++++++++++++ fvwm2.changes | 6 + fvwm2.spec | 4 +- 3 files changed, 155 insertions(+), 1 deletion(-) create mode 100644 fvwm-2.5.26-no-copy-dt-needed-entries.patch diff --git a/fvwm-2.5.26-no-copy-dt-needed-entries.patch b/fvwm-2.5.26-no-copy-dt-needed-entries.patch new file mode 100644 index 0000000..2f622e9 --- /dev/null +++ b/fvwm-2.5.26-no-copy-dt-needed-entries.patch @@ -0,0 +1,146 @@ +Index: fvwm-2.5.26/fvwm/Makefile.am +=================================================================== +--- fvwm-2.5.26.orig/fvwm/Makefile.am ++++ fvwm-2.5.26/fvwm/Makefile.am +@@ -35,7 +35,7 @@ LDADD = \ + -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) $(xpm_LIBS) \ + $(stroke_LIBS) $(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 \ + $(X_EXTRA_LIBS) -lm $(iconv_LIBS) $(Xrender_LIBS) $(Xcursor_LIBS) \ +- $(Bidi_LIBS) $(png_LIBS) $(rsvg_LIBS) $(intl_LIBS) ++ $(Bidi_LIBS) $(png_LIBS) $(rsvg_LIBS) $(intl_LIBS) -lfontconfig + + INCLUDES = \ + -I$(top_srcdir) $(stroke_CFLAGS) $(Xft_CFLAGS) \ +Index: fvwm-2.5.26/modules/FvwmButtons/Makefile.am +=================================================================== +--- fvwm-2.5.26.orig/modules/FvwmButtons/Makefile.am ++++ fvwm-2.5.26/modules/FvwmButtons/Makefile.am +@@ -22,7 +22,7 @@ FvwmButtons_DEPENDENCIES = $(top_builddi + LDADD = -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) $(xpm_LIBS) \ + $(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 -lm $(X_EXTRA_LIBS) \ + $(iconv_LIBS) $(Xrender_LIBS) $(Xcursor_LIBS) $(Bidi_LIBS) \ +- $(png_LIBS) $(rsvg_LIBS) ++ $(png_LIBS) $(rsvg_LIBS) -lfontconfig + + INCLUDES = -I$(top_srcdir) $(xpm_CFLAGS) $(Xft_CFLAGS) $(X_CFLAGS) \ + $(iconv_CFLAGS) $(Xrender_CFLAGS) $(fribidi_CFLAGS) $(png_CFLAGS) +Index: fvwm-2.5.26/modules/FvwmForm/Makefile.am +=================================================================== +--- fvwm-2.5.26.orig/modules/FvwmForm/Makefile.am ++++ fvwm-2.5.26/modules/FvwmForm/Makefile.am +@@ -45,7 +45,8 @@ config_DATA = \ + ## so we might as well link against libXpm, if present. + LDADD = -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) \ + $(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 $(X_EXTRA_LIBS) \ +- -lm $(Xrender_LIBS) $(rsvg_LIBS) $(iconv_LIBS) $(Bidi_LIBS) ++ -lm $(Xrender_LIBS) $(rsvg_LIBS) $(iconv_LIBS) $(Bidi_LIBS) \ ++ -lfontconfig + + INCLUDES = -I$(top_srcdir) $(Xft_CFLAGS) $(X_CFLAGS) $(iconv_CFLAGS) \ + $(Bidi_CFLAGS) $(Xrender_CFLAGS) +Index: fvwm-2.5.26/modules/FvwmIconBox/Makefile.am +=================================================================== +--- fvwm-2.5.26.orig/modules/FvwmIconBox/Makefile.am ++++ fvwm-2.5.26/modules/FvwmIconBox/Makefile.am +@@ -19,7 +19,7 @@ FvwmIconBox_DEPENDENCIES = $(top_builddi + LDADD = -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) $(xpm_LIBS) \ + $(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 -lm $(X_EXTRA_LIBS) \ + $(iconv_LIBS) $(Xrender_LIBS) $(Xcursor_LIBS) $(Bidi_LIBS) \ +- $(png_LIBS) $(rsvg_LIBS) ++ $(png_LIBS) $(rsvg_LIBS) -lfontconfig + + INCLUDES = -I$(top_srcdir) $(Xft_CFLAGS) $(xpm_CFLAGS) $(X_CFLAGS) \ + $(iconv_CFLAGS) $(Xrender_CFLAGS) $(Bidi_CFLAGS) $(png_CFLAGS) +Index: fvwm-2.5.26/modules/FvwmIconMan/Makefile.am +=================================================================== +--- fvwm-2.5.26.orig/modules/FvwmIconMan/Makefile.am ++++ fvwm-2.5.26/modules/FvwmIconMan/Makefile.am +@@ -21,7 +21,8 @@ FvwmIconMan_DEPENDENCIES = $(top_builddi + ## so we might as well link against libXpm, if present. + LDADD = -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) \ + $(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 $(X_EXTRA_LIBS) \ +- $(iconv_LIBS) $(Xrender_LIBS) $(rsvg_LIBS) -lm $(Bidi_LIBS) ++ $(iconv_LIBS) $(Xrender_LIBS) $(rsvg_LIBS) -lm $(Bidi_LIBS) \ ++ -lfontconfig + + INCLUDES = -I$(top_srcdir) $(Xft_CFLAGS) $(X_CFLAGS) \ + $(iconv_CFLAGS) $(Xrender_CFLAGS) $(Bidi_CFLAGS) +Index: fvwm-2.5.26/modules/FvwmIdent/Makefile.am +=================================================================== +--- fvwm-2.5.26.orig/modules/FvwmIdent/Makefile.am ++++ fvwm-2.5.26/modules/FvwmIdent/Makefile.am +@@ -18,7 +18,8 @@ FvwmIdent_DEPENDENCIES = $(top_builddir) + ## so we might as well link against libXpm, if present. + LDADD = -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) $(xpm_LIBS) \ + $(png_LIBS) $(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 -lm \ +- $(X_EXTRA_LIBS) $(Xrender_LIBS) $(rsvg_LIBS) $(iconv_LIBS) $(Bidi_LIBS) ++ $(X_EXTRA_LIBS) $(Xrender_LIBS) $(rsvg_LIBS) $(iconv_LIBS) $(Bidi_LIBS) \ ++ -lfontconfig + + INCLUDES = -I$(top_srcdir) $(Xft_CFLAGS) $(xpm_CFLAGS) $(png_CFLAGS) \ + $(X_CFLAGS) $(Xrender_CFLAGS) $(iconv_CFLAGS) $(Bidi_CFLAGS) +Index: fvwm-2.5.26/modules/FvwmPager/Makefile.am +=================================================================== +--- fvwm-2.5.26.orig/modules/FvwmPager/Makefile.am ++++ fvwm-2.5.26/modules/FvwmPager/Makefile.am +@@ -19,7 +19,7 @@ FvwmPager_DEPENDENCIES = $(top_builddir) + LDADD = -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) $(xpm_LIBS) \ + $(png_LIBS) $(rsvg_LIBS) $(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 \ + $(X_EXTRA_LIBS) -lm $(Xrender_LIBS) $(Xcursor_LIBS) $(iconv_LIBS) \ +- $(Bidi_LIBS) ++ $(Bidi_LIBS) -lfontconfig + + INCLUDES = -I$(top_srcdir) $(xpm_CFLAGS) $(png_CFLAGS) $(Xft_CFLAGS) \ + $(X_CFLAGS) $(Xrender_CFLAGS) $(iconv_CFLAGS) $(Bidi_CFLAGS) +Index: fvwm-2.5.26/modules/FvwmProxy/Makefile.am +=================================================================== +--- fvwm-2.5.26.orig/modules/FvwmProxy/Makefile.am ++++ fvwm-2.5.26/modules/FvwmProxy/Makefile.am +@@ -19,7 +19,7 @@ FvwmProxy_DEPENDENCIES = $(top_builddir) + LDADD = -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) $(xpm_LIBS) \ + $(png_LIBS) $(rsvg_LIBS) $(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 \ + $(X_EXTRA_LIBS) -lm $(Xrender_LIBS) $(Xcursor_LIBS) $(iconv_LIBS) \ +- $(Bidi_LIBS) ++ $(Bidi_LIBS) -lfontconfig + + INCLUDES = -I$(top_srcdir) $(xpm_CFLAGS) $(png_CFLAGS) $(Xft_CFLAGS) \ + $(X_CFLAGS) $(Xrender_CFLAGS) $(iconv_CFLAGS) $(Bidi_CFLAGS) +Index: fvwm-2.5.26/modules/FvwmScript/Makefile.am +=================================================================== +--- fvwm-2.5.26.orig/modules/FvwmScript/Makefile.am ++++ fvwm-2.5.26/modules/FvwmScript/Makefile.am +@@ -19,7 +19,7 @@ EXTRA_DIST = $(man_MANS) scanner.l scrip + LDADD = Widgets/libWidgets.a -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) \ + $(X_LIBS) $(xpm_LIBS) $(Xinerama_LIBS) $(X_PRE_LIBS) -lXext -lX11 \ + $(X_EXTRA_LIBS) -lm $(Xrender_LIBS) $(Xcursor_LIBS) $(iconv_LIBS) \ +- $(Bidi_LIBS) $(png_LIBS) $(rsvg_LIBS) $(intl_LIBS) ++ $(Bidi_LIBS) $(png_LIBS) $(rsvg_LIBS) $(intl_LIBS) -lfontconfig + + INCLUDES = -I$(top_srcdir) $(xpm_CFLAGS) $(Xft_CFLAGS) $(X_CFLAGS) \ + $(Xrender_CFLAGS) $(iconv_CFLAGS) $(Bidi_CFLAGS) $(png_CFLAGS) +Index: fvwm-2.5.26/modules/FvwmTaskBar/Makefile.am +=================================================================== +--- fvwm-2.5.26.orig/modules/FvwmTaskBar/Makefile.am ++++ fvwm-2.5.26/modules/FvwmTaskBar/Makefile.am +@@ -20,7 +20,7 @@ config_DATA = \ + LDADD = -L$(top_builddir)/libs $(X_LIBS) -lfvwm -lm $(xpm_LIBS) $(png_LIBS) \ + $(rsvg_LIBS) $(Xft_LIBS) $(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 \ + $(X_EXTRA_LIBS) $(Xrender_LIBS) $(Xcursor_LIBS) $(iconv_LIBS) \ +- $(Bidi_LIBS) $(intl_LIBS) ++ $(Bidi_LIBS) $(intl_LIBS) -lfontconfig + + INCLUDES = -I$(top_srcdir) $(xpm_CFLAGS) $(png_CFLAGS) $(Xft_CFLAGS) \ + $(X_CFLAGS) $(Xrender_CFLAGS) $(iconv_CFLAGS) $(Bidi_CFLAGS) \ +Index: fvwm-2.5.26/modules/FvwmWinList/Makefile.am +=================================================================== +--- fvwm-2.5.26.orig/modules/FvwmWinList/Makefile.am ++++ fvwm-2.5.26/modules/FvwmWinList/Makefile.am +@@ -20,7 +20,7 @@ FvwmWinList_DEPENDENCIES = $(top_builddi + ## so we might as well link against libXpm, if present. + LDADD = -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) \ + $(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 -lm $(X_EXTRA_LIBS) \ +- $(Xrender_LIBS) $(rsvg_LIBS) $(iconv_LIBS) $(Bidi_LIBS) ++ $(Xrender_LIBS) $(rsvg_LIBS) $(iconv_LIBS) $(Bidi_LIBS) -lfontconfig + + INCLUDES = -I$(top_srcdir) $(Xft_CFLAGS) $(X_CFLAGS) $(Xrender_CFLAGS) \ + $(iconv_CFLAGS) $(Bidi_CFLAGS) diff --git a/fvwm2.changes b/fvwm2.changes index dcc6d13..607e6fe 100644 --- a/fvwm2.changes +++ b/fvwm2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 1 15:21:45 UTC 2011 - pgajdos@suse.com + +- build with --no-copy-dt-needed-entries + * no-copy-dt-needed-entries.patch + ------------------------------------------------------------------- Fri Mar 11 20:26:21 UTC 2011 - coolo@novell.com diff --git a/fvwm2.spec b/fvwm2.spec index 5d4b3f9..32fc5ed 100644 --- a/fvwm2.spec +++ b/fvwm2.spec @@ -41,9 +41,10 @@ Patch0: fvwm-configure.patch Patch1: fvwm-%{version}-gcc-warnings.patch Patch2: fvwm-%{version}-ia64.patch Patch3: fvwm-%{version}-sv_SE.patch -Patch4: fvwm-%{version}-utf_encoding.patch +#Patch4: fvwm-%{version}-utf_encoding.patch Patch5: fvwm-%{version}-charset_in_title.patch Patch6: fvwm-2.5.26-libpng.patch +Patch7: fvwm-%{version}-no-copy-dt-needed-entries.patch %description FVWM is a virtual desktop window manager for the X Window System. @@ -67,6 +68,7 @@ compatible with the Motif MWM. %patch3 %patch5 %patch6 +%patch7 -p1 find . -name *sv_SE* |xargs rename sv_SE sv mkdir icons tar -C icons -j -x -v -f $RPM_SOURCE_DIR/fvwm_icons.tar.bz2