- change scrollkeeper-update execution

Changed files:
    meld-GNUmakefile.patch -> 1.1
    meld.spec -> 1.41

diff --git a/meld-GNUmakefile.patch b/meld-GNUmakefile.patch
new file mode 100644 (file)
index 0000000..76792b0
--- /dev/null
+++ b/meld-GNUmakefile.patch
@@ -0,0 +1,40 @@
+--- meld-1.1.3/help/C/GNUmakefile.orig 2006-02-01 22:54:56.000000000 +0100
++++ meld-1.1.3/help/C/GNUmakefile      2006-02-01 22:55:15.000000000 +0100
+@@ -10,7 +10,7 @@
+ 
+ .PHONY : all
+ all $(OMF_NAME).install : $(OMF_NAME)
+-      scrollkeeper-preinstall $(INST_XML) $(OMF_NAME) $(OMF_NAME).install
++      scrollkeeper-preinstall $(XML_DIR_)/meld.xml $(OMF_NAME) $(OMF_NAME).install
+ 
+ .PHONY : install
+ install : $(OMF_NAME).install
+@@ -18,7 +18,7 @@
+       install -m 644 meld.xml $(XML_DIR_)/meld.xml
+       install -m 644 figures/*.png $(XML_DIR_)/figures
+       -install -m 644 $< $(OMF_DIR_)/$(OMF_NAME)
+-      -scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_)
++      -scrollkeeper-update -o $(OMF_DIR_)
+ 
+ .PHONY : uninstall
+ uninstall :
+--- meld-1.1.3/help/es/GNUmakefile.orig        2006-02-01 22:54:07.000000000 +0100
++++ meld-1.1.3/help/es/GNUmakefile     2006-02-01 22:54:48.000000000 +0100
+@@ -10,7 +10,7 @@
+ 
+ .PHONY : all
+ all $(OMF_NAME).install : $(OMF_NAME)
+-      scrollkeeper-preinstall $(INST_XML) $(OMF_NAME) $(OMF_NAME).install
++      scrollkeeper-preinstall $(XML_DIR_)/meld.xml $(OMF_NAME) $(OMF_NAME).install
+ 
+ .PHONY : install
+ install : $(OMF_NAME).install
+@@ -18,7 +18,7 @@
+       install -m 644 meld.xml $(XML_DIR_)/meld.xml
+       install -m 644 figures/*.png $(XML_DIR_)/figures
+       -install -m 644 $< $(OMF_DIR_)/$(OMF_NAME)
+-      -scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_)
++      -scrollkeeper-update -o $(OMF_DIR_)
+ 
+ .PHONY : uninstall
+ uninstall :

diff --git a/meld.spec b/meld.spec
index b0793729bc592d97d1191d17b0e7a0f70a01e614..b19490b6e79baf473d91e0e2983995a70e9bbe6c 100644 (file)
--- a/meld.spec
+++ b/meld.spec
@@ -11,6 +11,7 @@ Group:                Applications/Text
 Source0:       http://ftp.gnome.org/pub/gnome/sources/meld/1.1/%{name}-%{version}.tar.bz2
 # Source0-md5: b958f6b3b5b849607d952f49eb082cba
 Patch0:                %{name}-desktop.patch
+Patch1:                %{name}-GNUmakefile.patch
 URL:           http://meld.sf.net/
 BuildRequires: gettext-devel
 BuildRequires: python-gnome-devel >= 2.10.0
@@ -49,6 +50,7 @@ zak
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__make} \
@@ -65,7 +67,6 @@ rm -rf $RPM_BUILD_ROOT
 
 rm -r $RPM_BUILD_ROOT%{_datadir}/application-registry
 rm -f $RPM_BUILD_ROOT%{py_sitedir}/{%{name},%{name}/vc}/*.py
-rm -rf $RPM_BUILD_ROOT%{_prefix}/var
 
 %find_lang %{name} --with-gnome