rpms/simdock/devel simdock-1.2-dso.patch, NONE, 1.1 simdock.spec, 1.6, 1.7

[terjeros]

Author: terjeros

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

Modified Files:
	simdock.spec 
Added Files:
	simdock-1.2-dso.patch 
Log Message:
* Sun Feb 14 2010 Terje Rosten <terje.rosten at ntnu.no> - 1.2-8
- Add DSO patch


simdock-1.2-dso.patch:
 configure.ac |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE simdock-1.2-dso.patch ---
diff -up trunk/configure.ac~ trunk/configure.ac
--- trunk/configure.ac~	2007-07-07 09:17:38.000000000 +0200
+++ trunk/configure.ac	2010-02-14 18:37:01.385240414 +0100
@@ -107,7 +107,10 @@ CPPFLAGS="$DEPS_CPPFLAGS $DEPS_CFLAGS $W
 CXXFLAGS="$DEPS_CXXFLAGS $DEPS_CFLAGS $WX_CPPFLAGS"
 LIBS="$DEPS_LIBS $WX_LIBS"
 
+PKG_CHECK_MODULES(X, x11)
 
+CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+LIBS="$LIBS $X_LIBS"
 
 #AC_SUBST(WX_LIBS)
 


Index: simdock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/simdock/devel/simdock.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- simdock.spec	27 Jul 2009 04:20:32 -0000	1.6
+++ simdock.spec	14 Feb 2010 17:50:23 -0000	1.7
@@ -1,7 +1,7 @@
 Name:          simdock
 Summary:       Fast and customizable dockbar
 Version:       1.2
-Release:       7%{?dist}
+Release:       8%{?dist}
 License:       GPLv2+
 Group:         User Interface/Desktops
 URL:           http://simdock.sourceforge.net/
@@ -12,11 +12,14 @@ Patch1:        simdock-1.2-pixmap.patch
 Patch2:        simdock-1.2-readme.patch
 Patch3:        simdock-1.2-tasks.patch
 Patch4:        simdock-1.2-build-envvars.patch
+Patch5:        simdock-1.2-dso.patch
 Buildrequires: desktop-file-utils
 BuildRequires: GConf2-devel
 BuildRequires: libwnck-devel
 BuildRequires: startup-notification-devel
 BuildRequires: wxGTK-devel
+BuildRequires: automake
+BuildRequires: autoconf
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -32,9 +35,12 @@ environments. Does not require Compiz no
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 %{__install} -m 0644 %{SOURCE1} .
+%{__ln_s} configure.ac configure.in
 
 %build
+./autogen.sh
 %configure --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
@@ -56,6 +62,9 @@ desktop-file-install --dir %{buildroot}%
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Sun Feb 14 2010 Terje Rosten <terje.rosten at ntnu.no> - 1.2-8
+- Add DSO patch
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild