Accepting request 266388 from home:posophe:branches:security

- Update to version 5.0.20141106
  + Too many things to list; please read the changelog file
- Cleanup specfile
- Split out cdk library to a lib subpackage
- Update Url and source download Url
- Remove obsolete cdk-4.9.13.dif

OBS-URL: https://build.opensuse.org/request/show/266388
OBS-URL: https://build.opensuse.org/package/show/security/cdk?expand=0&rev=11

cdk-4.9.13.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f6df15578e83ad08afe7bdbd2af573ec08d70310dc6e97b49601836fb913223c
-size 239725

cdk-5.0-20141106.tgz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d7ce8d9698b4998fa49a63b6e19309d3eb61cc3a019bfc95101d845ef03c4803
+size 509310

cdk.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Dec 25 16:52:21 UTC 2014 - p.drouand@gmail.com
+
+- Update to version 5.0.20141106
+  + Too many things to list; please read the changelog file
+- Cleanup specfile
+- Split out cdk library to a lib subpackage
+- Update Url and source download Url
+- Remove obsolete cdk-4.9.13.dif
+
 -------------------------------------------------------------------
 Fri Sep 30 20:07:47 UTC 2011 - coolo@suse.com
 

cdk.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package cdk
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -15,18 +15,20 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
+%define lname lib%{name}5
+%define mainver 5.0
+%define datever 20141106
 
 Name:           cdk
-License:        BSD3c(or similar)
+License:        BSD-3-Clause
+Url:            http://invisible-island.net/cdk/
 BuildRequires:  libtool
 BuildRequires:  ncurses-devel
 Group:          System/Libraries
-Version:        4.9.13
+Version:        %{mainver}.%{datever}
-Release:        140
+Release:        0
 Summary:        The Runtime for the Curses Development Kit
-Source:         cdk-4.9.13.tar.bz2
+Source:         ftp://invisible-island.net/cdk-%{mainver}-%{datever}.tgz
-Patch:          cdk-4.9.13.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -35,55 +37,60 @@ contains 21 ready to use widgets, some of which are: a text entry
 field, a scrolling list, a selection list, an alphalist, a pull-down
 menu, a radio list, a viewer widget, and a dialog box.
 
-%package -n cdk-devel
+%package -n %lname
-License:        BSD3c(or similar)
+License:        BSD-3-Clause
+Summary:        The Runtime for the Curses Development Kit - Shared library
+Group:          Development/Libraries/C and C++
+
+%description -n %lname
+CDK is a widget set developed on top of the basic curses library. It
+contains 21 ready to use widgets, some of which are: a text entry
+field, a scrolling list, a selection list, an alphalist, a pull-down
+menu, a radio list, a viewer widget, and a dialog box.
+
+%package devel
+License:        BSD-3-Clause
 Summary:        Development Part of Curses Development Kit
 Group:          Development/Libraries/C and C++
-Requires:       %{name} = %{version} ncurses-devel
+Requires:       %{lname} = %{version}
+Requires:       ncurses-devel
 
-%description -n cdk-devel
+%description devel
 This package includes the development headers and static libraries for
 CDK, the Curses Development Kit.
 
 %prep
-%setup -q
+%setup -q -n cdk-%{mainver}-%{datever}
-%patch -p0
 
 %build
-touch NEWS AUTHORS
+%configure --with-ncurses --enable-const
-ln -sf CHANGES ChangeLog
+make cdkshlib %{?_smp_mflags}
-CFLAGS="${RPM_OPT_FLAGS} -pipe"
-LDFLAGS=-s
-CC=gcc
-PATH=$PATH:.
-export CFLAGS CC LDFLAGS PATH
-%{?suse_update_config}
-autoreconf --force --install
-%configure --includedir=/usr/include/cdk \
-		--enable-shared \
-		--disable-static \
-		--with-gnu-ld \
-		--with-pic
-%{__make} %{?smpflags}
 
 %install
-make DESTDIR=${RPM_BUILD_ROOT} install
+make install installCDKSHLibrary DESTDIR=%{buildroot} INSTALL="install -pD"
-%{__rm} -f %{buildroot}%{_libdir}/*.la
+# fixes rpmlint unstripped-binary-or-object
+chmod +x %{buildroot}%{_libdir}/*.so
+find %{buildroot} -name '*.a' -delete -print
+# Remove installed in wrong directory documentation files
+rm -rf %{buildroot}%{_datadir}/doc
 
-%post -p /sbin/ldconfig
+%post -n %lname
+/sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun -n %lname
+/sbin/ldconfig
 
-%files
+%files -n %lname
 %defattr(-,root,root)
-%doc BUGS EXPANDING NOTES TODO COPYING LICENSE INSTALL README CHANGES
+%doc EXPANDING NOTES TODO COPYING README CHANGES VERSION
-%{_libdir}/libcdk.so.4.0.9
+%{_libdir}/libcdk.so.5*
-%{_libdir}/libcdk.so.4
 
-%files -n cdk-devel
+%files devel
 %defattr(-,root,root)
+%{_bindir}/cdk5-config
 %{_libdir}/libcdk.so
-/usr/include/cdk
+%{_includedir}/%{name}
-/usr/share/man/man3/cdk_*.3.gz
+%{_includedir}/%{name}.h
+%{_mandir}/man3/*.3.gz
 
 %changelog