Hello community, here is the log from the commit of package libcryptopp for openSUSE:Factory checked in at 2012-02-07 14:46:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcryptopp (Old) and /work/SRC/openSUSE:Factory/.libcryptopp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libcryptopp", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libcryptopp/libcryptopp.changes 2011-10-18 14:29:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libcryptopp.new/libcryptopp.changes 2012-02-07 14:46:05.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Feb 5 16:39:49 UTC 2012 - jengelh@medozas.de + +- Proper shared library versioning + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcryptopp.spec ++++++ --- /var/tmp/diff_new_pack.hLExoo/_old 2012-02-07 14:46:12.000000000 +0100 +++ /var/tmp/diff_new_pack.hLExoo/_new 2012-02-07 14:46:12.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libcryptopp # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,15 @@ Name: libcryptopp Version: 5.6.1 -Release: 6 -License: SUSE-Public-Domain +Release: 0 %define pkg_version 561 -# This needs to be bumped manually with every ABI change since there is -# no upstream interface version information. Please keep in sync with -# Debian: http://packages.debian.org/en/source/experimental/libcrypto++ -%define soname 9 +# There is no upstream interface version information. +# Therefore we need unique basenames: +%define soname -5_6_1-0 Summary: Crypto++ Library -URL: http://www.cryptopp.com +License: SUSE-Public-Domain Group: Development/Libraries/C and C++ +Url: http://www.cryptopp.com # http://www.cryptopp.com/cryptopp%%{pkg_version}.zip Source: cryptopp%{pkg_version}.tar.bz2 Source2: cryptopp.pc @@ -65,8 +64,7 @@ PREFIX="%{_prefix}" \ LIB="%{_lib}" \ CXX="g++" \ - VERSION="%{soname}.0.0" \ - MAJOR="%{soname}" \ + LIBSUFFIX="-%version" \ LDFLAGS="-pthread" \ all @@ -76,8 +74,7 @@ PREFIX="%{_prefix}" \ LIB="%{_lib}" \ CXX="g++" \ - VERSION="%{soname}.0.0" \ - MAJOR="%{soname}" \ + LIBSUFFIX="-%version" \ install rm -rf "%{buildroot}%{_bindir}" mkdir %{buildroot}%{_libdir}/pkgconfig/ @@ -92,8 +89,7 @@ %files -n %{name}%{soname} %defattr(-,root,root) -%{_libdir}/libcryptopp.so.%{soname} -%{_libdir}/libcryptopp.so.%{soname}.* +%_libdir/libcryptopp-%version.so.0 %files -n %{name}-devel %defattr(-,root,root) ++++++ libcryptopp-shared.patch ++++++ --- /var/tmp/diff_new_pack.hLExoo/_old 2012-02-07 14:46:12.000000000 +0100 +++ /var/tmp/diff_new_pack.hLExoo/_new 2012-02-07 14:46:12.000000000 +0100 @@ -1,5 +1,11 @@ ---- GNUmakefile.orig 2010-08-09 14:22:42.000000000 +0200 -+++ GNUmakefile 2010-12-16 15:58:54.174167505 +0100 +--- + GNUmakefile | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +Index: GNUmakefile +=================================================================== +--- GNUmakefile.orig ++++ GNUmakefile @@ -1,7 +1,7 @@ CXXFLAGS = -DNDEBUG -g -O2 #CXXFLAGS = -g @@ -9,7 +15,7 @@ # the following options reduce code size, but breaks link or makes link very slow on some systems # CXXFLAGS += -ffunction-sections -fdata-sections # LDFLAGS += -Wl,--gc-sections -@@ -134,26 +134,29 @@ +@@ -134,26 +134,27 @@ DLLTESTOBJS = dlltest.dllonly.o all: cryptest.exe test: cryptest.exe @@ -27,9 +33,8 @@ - $(CP) *.exe $(PREFIX)/bin + $(MKDIR) -p $(DESTDIR)$(PREFIX)/include/cryptopp $(DESTDIR)$(PREFIX)/$(LIB) $(DESTDIR)$(PREFIX)/bin + $(CP) *.h $(DESTDIR)$(PREFIX)/include/cryptopp -+ $(CP) libcryptopp.so.$(VERSION) $(DESTDIR)$(PREFIX)/$(LIB) -+ ln -s libcryptopp.so.$(VERSION) $(DESTDIR)$(PREFIX)/$(LIB)/libcryptopp.so.$(MAJOR) -+ ln -s libcryptopp.so.$(MAJOR) $(DESTDIR)$(PREFIX)/$(LIB)/libcryptopp.so ++ $(CP) libcryptopp${LIBSUFFIX}.so.0 $(DESTDIR)$(PREFIX)/$(LIB) ++ ln -s libcryptopp${LIBSUFFIX}.so.0 $(DESTDIR)$(PREFIX)/$(LIB)/libcryptopp.so + $(CP) *.exe $(DESTDIR)$(PREFIX)/bin libcryptopp.a: $(LIBOBJS) @@ -38,9 +43,8 @@ libcryptopp.so: $(LIBOBJS) - $(CXX) -shared -o $@ $(LIBOBJS) -+ $(CXX) -shared -Wl,-soname,libcryptopp.so.$(MAJOR) -o libcryptopp.so.$(VERSION) $(LIBOBJS) $(LDFLAGS) $(LDLIBS) -+ ln -s libcryptopp.so.$(VERSION) libcryptopp.so.$(MAJOR) -+ ln -s libcryptopp.so.$(MAJOR) $@ ++ $(CXX) -shared -Wl,-soname,libcryptopp${LIBSUFFIX}.so.0 -o libcryptopp${LIBSUFFIX}.so.0 $(LIBOBJS) $(LDFLAGS) $(LDLIBS) ++ ln -s libcryptopp${LIBSUFFIX}.so.0 $@ -cryptest.exe: libcryptopp.a $(TESTOBJS) +cryptest.exe: libcryptopp.so $(TESTOBJS) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org