Accepting request 111372 from X11:windowmanagers

Fix build on Factory (forwarded request 111224 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/111372
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/epplet-base?expand=0&rev=14

epplet-base-linking.patch

@@ -0,0 +1,64 @@
+Index: epplets-0.10/configure.in
+===================================================================
+--- epplets-0.10.orig/configure.in
++++ epplets-0.10/configure.in
+@@ -39,6 +39,7 @@ dnl# At least make the attempt to suppor
+ AC_CYGWIN
+ 
+ AM_PROG_LIBTOOL
++LT_LIB_M
+ 
+ AC_GCC_TRADITIONAL
+ 
+Index: epplets-0.10/epplets/Makefile.am
+===================================================================
+--- epplets-0.10.orig/epplets/Makefile.am
++++ epplets-0.10/epplets/Makefile.am
+@@ -54,6 +54,7 @@ E_Exec_epplet_LDFLAGS = -rpath $(libdir)
+ E_SD_epplet_SOURCES = E-SD.c esdcloak.c utils.c utils.h esdcloak.h
+ E_SD_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
+ E_SD_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir) -lesd
++E_SD_epplet_LDADD = $(LDADD) $(LIBM)
+ 
+ E_Load_epplet_SOURCES = E-Load.c
+ E_Load_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
+@@ -68,10 +69,12 @@ E_LoadMeter_epplet_LDADD = $(LDADD) $(GT
+ E_Clock_epplet_SOURCES = E-Clock.c
+ E_Clock_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
+ E_Clock_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
++E_Clock_epplet_LDADD = $(LDADD) $(LIBM)
+ 
+ E_MoonClock_epplet_SOURCES = E-MoonClock.c CalcEphem.c CalcEphem.h Moon.c
+ E_MoonClock_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
+ E_MoonClock_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
++E_MoonClock_epplet_LDADD = $(LDADD) $(LIBM)
+ 
+ E_Time_epplet_SOURCES = E-Time.c
+ E_Time_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
+@@ -145,15 +148,18 @@ E-ScreenShoot.c cloak.c utils.c utils.h
+ E-ScreenShoot_ftp.c E-ScreenShoot_ftp.h
+ E_ScreenShoot_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
+ E_ScreenShoot_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
++E_ScreenShoot_epplet_LDADD = $(LDADD) $(LIBM)
+ 
+ E_NetGraph_epplet_SOURCES = E-NetGraph.c net.c net.h
+ E_NetGraph_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
+ E_NetGraph_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
++E_NetGraph_epplet_LDADD = $(LDADD) $(LIBM)
+ 
+ E_ScreenSave_epplet_SOURCES = \
+ E-ScreenSave.c cloak.c utils.c utils.h cloak.h
+ E_ScreenSave_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
+ E_ScreenSave_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
++E_ScreenSave_epplet_LDADD = $(LDADD) $(LIBM)
+ 
+ E_UrlWatch_epplet_SOURCES = E-UrlWatch.c E-UrlWatch.h utils.c utils.h
+ E_UrlWatch_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
+@@ -162,6 +168,7 @@ E_UrlWatch_epplet_LDFLAGS = -rpath $(lib
+ E_Mountbox_epplet_SOURCES = E-Mountbox.c
+ E_Mountbox_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
+ E_Mountbox_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
++E_Mountbox_epplet_LDADD = $(LDADD) $(LIBM)
+ 
+ E_Pinger_epplet_SOURCES = E-Pinger.c
+ E_Pinger_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la

epplet-base.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar 26 20:08:49 UTC 2012 - dimstar@opensuse.org
+
+- Add epplet-base-linking.patch: Fix linking.
+
 -------------------------------------------------------------------
 Fri Sep 30 20:07:59 UTC 2011 - coolo@suse.com
 

epplet-base.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package epplet-base
 #
-# 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
@@ -19,15 +19,25 @@
 Url:            http://www.enlightenment.org/
 
 Name:           epplet-base
-BuildRequires:  Mesa-devel esound-devel freeglut-devel gcc-c++ giflib-devel imlib2-devel jpeg libpng-devel libtiff-devel tiff
+BuildRequires:  Mesa-devel
+BuildRequires:  esound-devel
+BuildRequires:  freeglut-devel
+BuildRequires:  gcc-c++
+BuildRequires:  giflib-devel
+BuildRequires:  imlib2-devel
+BuildRequires:  jpeg
+BuildRequires:  libpng-devel
+BuildRequires:  libtiff-devel
 BuildRequires:  libtool
+BuildRequires:  tiff
+Summary:        Applets for the Enlightenment Window Manager
 License:        GPL-2.0+
 Group:          System/GUI/Other
-Summary:        Applets for the Enlightenment Window Manager
 Version:        0.10
-Release:        52
+Release:        0
 Source:         epplets-%{version}.tar.bz2
 Patch:          epplets-unsuficient_include.patch
+Patch1:         epplet-base-linking.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -39,6 +49,7 @@ information.
 %prep
 %setup -q -n epplets-%{version}
 %patch 
+%patch1 -p1
 
 %build
 autoreconf --force --install