[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
problems with making rpm's
Hi:
I want to update a package on my SuSE box by building a new rpm. This
is a version increment from ted-2.11 to ted-2.14. Following the advice
of the RPM-HOWTO, I want to drop in the new ted-2.14.src.tar.gz in
place of the old ted-2.11.src.tar.bz2. To do that I have to modify my
patch file. I was able to modify the patch file but I cannot generate a
diff that is similar to the one SuSE had. Theirs looks like this:
--- Ted/makefile.in
+++ Ted/makefile.in
@@ -190,6 +190,7 @@
-lXext \
$(X_PRE_LIBS) \
-lX11 \
+ -ldl \
$(X_EXTRA_LIBS)
GUI_LIBS= $(XPM_LIBS) -lXpm $(@GUI@_LIBS)
--- Ted/tedConfig.h.in
+++ Ted/tedConfig.h.in
@@ -41,7 +41,9 @@
<SNIP>
but I made mine by taking the dif between the modified and original
directories and it looks like this:
planck@linux:~> cat TedDir.patch
diff -rau /home/planck/Ted-2.14/Ted/makefile.in
/home/planck/TedM/Ted/makefile.in
--- /home/planck/Ted-2.14/Ted/makefile.in 2003-04-04
06:46:46.000000000 -0600
+++ /home/planck/TedM/Ted/makefile.in 2003-04-06 17:30:05.000000000
-0500
@@ -216,6 +216,7 @@
-lXext \
$(X_PRE_LIBS) \
-lX11 \
+ -ldl
$(X_EXTRA_LIBS)
MOTIF_STATIC_LIBS= \
diff -rau /home/planck/Ted-2.14/Ted/tedConfig.h.in
/home/planck/TedM/Ted/tedConfig.h.in
<SNIP>
With this format I cannot apply the patch. How do I get my patch in the
form that SuSE had? That is in the form of the first (original) patch
above.
TIA
Jonathan
-
To unsubscribe, send email to majordomo@silug.org with
"unsubscribe silug-discuss" in the body.