rpms/tomboy/devel tomboy-build.patch, NONE, 1.1 tomboy.spec, 1.141, 1.142

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/tomboy/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14521

Modified Files:
	tomboy.spec 
Added Files:
	tomboy-build.patch 
Log Message:
fix the build


tomboy-build.patch:
 Makefile.am |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE tomboy-build.patch ---
diff -up tomboy-1.3.1/Tomboy/Makefile.am.build tomboy-1.3.1/Tomboy/Makefile.am
--- tomboy-1.3.1/Tomboy/Makefile.am.build	2010-07-15 00:58:02.429956001 -0400
+++ tomboy-1.3.1/Tomboy/Makefile.am	2010-07-15 00:59:36.290956000 -0400
@@ -204,7 +204,8 @@ $(PANEL_WRAPPER): $(srcdir)/$(PANEL_WRAP
 	chmod +x $(PANEL_WRAPPER)
 
 $(TARGET).config: $(srcdir)/$(TARGET_NAME$).config.in Makefile
-	sed -e "s|\@pkglibdir\@|$(pkglibdir)|" \
+	mkdir -p `dirname $(TARGET)` && 		\
+	sed -e "s|\@pkglibdir\@|$(pkglibdir)|" 		\
 	    < $< > $@
 
 Defines.cs: $(srcdir)/Defines.cs.in Makefile


Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- tomboy.spec	30 Jun 2010 05:14:25 -0000	1.141
+++ tomboy.spec	15 Jul 2010 05:02:07 -0000	1.142
@@ -12,6 +12,8 @@ URL:            http://projects.gnome.or
 #VCS: git:git://git.gnome.org/tomboy
 Source0:        http://download.gnome.org/sources/tomboy/1.3/%{name}-%{version}.tar.bz2
 
+Patch0:         tomboy-build.patch
+
 BuildRequires:  gtk2-devel >= 2.6.0
 BuildRequires:  atk-devel >= 1.2.4
 BuildRequires:  gnome-panel-devel
@@ -51,6 +53,9 @@ to develop addins that add new functiona
 
 %prep
 %setup -q
+%patch0 -p1 -b .build
+
+autoreconf -i -f
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -70,22 +75,6 @@ chmod a+x $RPM_BUILD_ROOT%{_libdir}/%{na
 # don't need these
 rm $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
-# save space by linking identical images in translated docs
-helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name}
-for f in $helpdir/C/figures/*.png; do
-  b="$(basename $f)"
-  for d in $helpdir/*; do
-    if [ -d "$d" -a "$d" != "$helpdir/C" ]; then
-      g="$d/figures/$b"
-      if [ -f "$g" ]; then
-        if cmp -s $f $g; then
-          rm "$g"; ln -s "../../C/figures/$b" "$g"
-        fi
-      fi
-    fi
-  done
-done
-
 %find_lang %name --with-gnome
 
 cd $RPM_BUILD_ROOT%{_datadir}/mime