rpms/gkrellm/devel gkrellm-2.3.4-no-add-needed.patch, NONE, 1.1 gkrellm.spec, 1.28, 1.29

Sun Feb 14 21:58:10 UTC 2010

Author: scop

Update of /cvs/pkgs/rpms/gkrellm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22695

Modified Files:
	gkrellm.spec 
Added Files:
	gkrellm-2.3.4-no-add-needed.patch 
Log Message:
* Sun Feb 14 2010 Ville Skyttä <ville.skytta at iki.fi> - 2.3.4-2
- Fix build with --no-add-needed (#564850).
- Fix plugin dir defaults in installed headers.
- Build with NTLM support.


gkrellm-2.3.4-no-add-needed.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gkrellm-2.3.4-no-add-needed.patch ---
diff -up gkrellm-2.3.4/src/Makefile~ gkrellm-2.3.4/src/Makefile
--- gkrellm-2.3.4/src/Makefile~	2010-01-05 01:12:07.000000000 +0200
+++ gkrellm-2.3.4/src/Makefile	2010-02-13 18:10:45.000000000 +0200
@@ -91,7 +91,7 @@ FLAGS = -O2 -I.. -I$(SHARED_PATH) $(PKG_
  ${NTLM_INCLUDES} -DGKRELLM_CLIENT
 
 LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(SSL_LIBS) $(SENSORS_LIBS) \
- $(NTLM_LIBS) $(X11_LIBS)
+ $(NTLM_LIBS) $(X11_LIBS) -lm
 
 ifeq ($(debug),1)
     FLAGS += -g


Index: gkrellm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/devel/gkrellm.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- gkrellm.spec	5 Jan 2010 12:39:28 -0000	1.28
+++ gkrellm.spec	14 Feb 2010 21:58:10 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           gkrellm
 Version:        2.3.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPLv3+
@@ -9,11 +9,13 @@ Source0:        http://members.dslextrem
 Source1:        gkrellmd.init
 Source2:        gkrellm.desktop
 Source3:        gkrellm.png
+# Sent upstream 2010-02-14
+Patch0:         gkrellm-2.3.4-no-add-needed.patch
 Patch1:         gkrellm-2.1.28-config.patch
 Patch2:         gkrellm-2.2.4-sansfont.patch
 Patch3:         gkrellm-2.2.7-width.patch
 BuildRequires:  gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext
-BuildRequires:  lm_sensors-devel
+BuildRequires:  lm_sensors-devel libntlm-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -56,24 +58,21 @@ Development files for the GNU Krell Moni
 
 %prep
 %setup -q
+%patch0 -p1 -z .no-add-needed
 %patch1 -p1 -z .config
 %patch2 -p1 -z .sansfont
 %patch3 -p1 -z .width
 
-for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html; do
-   sed -i -e "s@/usr/lib/gkrellm2/plugins@%{_libdir}/gkrellm2/plugins@" $i
-   sed -i -e "s@/usr/lib/gkrellm/plugins@%{_libdir}/gkrellm2/plugins@" $i
-done
-for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html; do
-   sed -i -e "s@/usr/local/lib/gkrellm2/plugins@/usr/local/%{_lib}/gkrellm2/plugins@" $i
-   sed -i -e "s@/usr/local/lib/gkrellm/plugins@/usr/local/%{_lib}/gkrellm2/plugins@" $i
+for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html \
+    src/gkrellm.h server/gkrellmd.h; do
+   sed -i -e "s@/usr/lib/gkrellm2*/plugins@%{_libdir}/gkrellm2/plugins@" $i
+   sed -i -e "s@/usr/local/lib/gkrellm2*/plugins@/usr/local/%{_lib}/gkrellm2/plugins@" $i
 done
 
 
 %build
 make %{?_smp_mflags} INSTALLROOT=%{_prefix} PKGCONFIGDIR=%{_libdir}/pkgconfig \
-  INCLUDEDIR=%{_includedir} \
-  CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DSYSTEM_PLUGINS_DIR='\"%{_libdir}/gkrellm2/plugins\"'"
+  INCLUDEDIR=%{_includedir} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
 
 
 %install
@@ -165,6 +164,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Feb 14 2010 Ville Skyttä <ville.skytta at iki.fi> - 2.3.4-2
+- Fix build with --no-add-needed (#564850).
+- Fix plugin dir defaults in installed headers.
+- Build with NTLM support.
+
 * Tue Jan  5 2010 Hans de Goede <hdegoede at redhat.com> 2.3.4-1
 - New upstream release 2.3.4
 
@@ -186,7 +190,7 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Tue Mar 17 2009 Ville Skyttä <ville.skytta at iki.fi> - 2.3.2-4
+* Tue Mar 17 2009 Ville Skyttä <ville.skytta at iki.fi> - 2.3.2-4
 - Sync icon cache update scriptlets with current Fedora guidelines.
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.2-3
@@ -214,7 +218,7 @@ rm -rf $RPM_BUILD_ROOT
 - Fix building with latest glibc
 - Rebuild for gcc 4.3
 
-* Tue Dec  4 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.3.1-2
+* Tue Dec  4 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.3.1-2
 - Clean up desktop-file-utils 0.14 warnings.
 
 * Mon Dec  3 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.1-1
@@ -224,11 +228,11 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Oct 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.0-5
 - Add support for lm_sensors-3.0.0
 
-* Wed Sep  5 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.3.0-4
+* Wed Sep  5 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.3.0-4
 - Rewrite gkrellmd init script: better LSB compliance, hddtemp
   interoperability, avoidance of X error messages, general cleanup.
 
-* Tue Sep  4 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.3.0-3
+* Tue Sep  4 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.3.0-3
 - Fix gnutls detection/build and use it instead of openssl.
 - Sync user and group creation with current Fedora guidelines.
 
@@ -409,7 +413,7 @@ rm -rf $RPM_BUILD_ROOT
 - make it compatible with 3d party packages
 
 * Thu Oct 09 2003 Karsten Hopp <karsten at redhat.de> 2.1.20-2
-- added patches from Ville Skyttä <ville.skytta at iki.fi>:
+- added patches from Ville Skyttä <ville.skytta at iki.fi>:
   - Add icon for desktop entry
   - Install daemon in %%{_sbindir}
   - Include themes and plugins dirs in main package

