Hello community,

here is the log from the commit of package fsvs for openSUSE:Factory
checked in at Wed Aug 31 10:40:32 CEST 2011.



--------
--- fsvs/fsvs.changes   2011-07-21 16:44:13.000000000 +0200
+++ /mounts/work_src_done/STABLE/fsvs/fsvs.changes      2011-08-31 
06:09:33.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Aug 31 04:08:50 UTC 2011 - crrodrig...@opensuse.org
+
+- Fix linking. 
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  fsvs-1.2.3-linking.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ fsvs.spec ++++++
--- /var/tmp/diff_new_pack.4wCx5K/_old  2011-08-31 10:39:41.000000000 +0200
+++ /var/tmp/diff_new_pack.4wCx5K/_new  2011-08-31 10:39:41.000000000 +0200
@@ -19,7 +19,7 @@
 
 Name:           fsvs
 Version:        1.2.3
-Release:        1
+Release:        3
 License:        GPL
 Url:            http://fsvs.tigris.org/
 Group:          Productivity/Archiving/Backup
@@ -27,6 +27,7 @@
 Source:         http://download.fsvs-software.org/fsvs-%{version}.tar.bz2
 Patch1:         fsvs-destdir.patch
 Patch2:         gcc46.diff
+Patch3:         fsvs-1.2.3-linking.patch
 BuildRequires:  apache2-devel ctags db-devel ed gcc-c++ gdbm gdbm-devel 
neon-devel openldap2-devel openssl-devel pcre-devel subversion-devel zlib-devel
 BuildRequires:  libapr-util1-devel libapr1-devel pkgconfig
 BuildRequires:  gcc glibc-devel make
@@ -52,15 +53,12 @@
 %setup -q
 %patch1
 %patch2
+%patch3
 
 %build
-export SUSE_ASNEEDED=0
 export CFLAGS="%{optflags} $(pkg-config --includes apr-1)"
 export CFLAGS="$CFLAGS -fno-strict-aliasing"
-
-CFLAGS="$CFLAGS" \
-CPPFLAGS="$CFLAGS" \
-%configure
+%configure --disable-silent-rules
 %__make %{?jobs:-j%{jobs}}
 
 %install

++++++ fsvs-1.2.3-linking.patch ++++++
--- src/Makefile.in.orig
+++ src/Makefile.in
@@ -16,9 +16,9 @@ HEADREV       := "$Revision: 2424 $"
 VERSION        = $(shell  perl -e '($$r) = (q( $(HEADREV) ) =~ m:(\d+):); $$t= 
q( $(HEADURL) ) =~ m:/tags/([^/]+): ? $$1 : "trunk"; print "$$t:$$r\n";' )
 
 CFLAGS := @CFLAGS@
-CFLAGS += -Wall -funsigned-char -Os -DFSVS_VERSION='"$(VERSION)"' 
+CFLAGS += -Wall -funsigned-char -DFSVS_VERSION='"$(VERSION)"' 
 LDFLAGS        := @LDFLAGS@
-FSVS_LDFLAGS = $(LDFLAGS) -lsvn_subr-1 -lsvn_delta-1 -lsvn_ra-1 -lpcre -lgdbm
+FSVS_LDFLAGS = $(LDFLAGS) -lapr-1 -laprutil-1 -lsvn_subr-1 -lsvn_delta-1 
-lsvn_ra-1 -lpcre -lgdbm -ldl
 EXTRALIBS      := @EXTRALIBS@
 WAA_CHARS?= @WAA_WC_MD5_CHARS@
 
@@ -146,13 +146,13 @@ docs: $(MANDEST)/fsvs-howto-backup.5 $(M
 ################################ Rules ######################################
 %.o:   %.c
        @echo "     CC $<"
-       @$(CC) $(CFLAGS) -c -o $@ $<
+       $(CC) $(CFLAGS) -c -o $@ $<
 
 # if the Makefile has changed, the output will (at least sometimes)
 # change, too.
 $(DEST): $(C_FILES:%.c=%.o)
        @echo "     Link $@"
-       @$(CC) $(FSVS_LDFLAGS) $(LDLIBS) $(LIBS) $(EXTRALIBS) -o $@ $^
+       $(CC) -Wl,--unresolved-symbols=report-all -Wl,-z,noexecstack -o $@ $^  
$(FSVS_LDFLAGS) $(LDLIBS) $(LIBS) $(EXTRALIBS)
 ifeq (@ENABLE_RELEASE@, 1)
        -strip $@
 endif
@@ -169,7 +169,7 @@ endif
 deps:  $(D_FILES)
 .%.d:  %.c
        @echo "     deps for $<"
-       @$(CC) $(INCS) -MM $< | perl -pe 's#\bdoc.g-c\b##' > $@
+       $(CC) $(INCS) -MM $< | perl -pe 's#\bdoc.g-c\b##' > $@
 #      $(CC) $(INCS) -MM -MF $@ $<
 include $(D_FILES)
 
--- src/fsvs.c.orig
+++ src/fsvs.c
@@ -636,8 +636,7 @@ const char* Version(FILE *output)
                        " version " FSVS_VERSION "\n");
        if (opt__is_verbose()>0)
        {
-               fprintf(output, "compiled on " __DATE__ " " __TIME__ 
-                               ", with options:\n\t"
+               fprintf(output, "compiled with options:\n\t"
 #ifdef HAVE_VALGRIND
                                STRINGIFY(HAVE_VALGRIND)
 #endif

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to