From a69c1d4557b3ccb8a771f99767a9fcbb144528d455710ec8ec6b5f3b2b5ab2c6 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Thu, 6 Jun 2013 06:50:50 +0000 Subject: [PATCH] Accepting request 177792 from home:jengelh:branches:devel:libraries:c_c++ - More robust make install call - Remove redundant %clean section - Requires(pre) is useless without a %pre script OBS-URL: https://build.opensuse.org/request/show/177792 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libmicrohttpd?expand=0&rev=20 --- libmicrohttpd-0.9.27.tar.gz | 3 --- libmicrohttpd-0.9.27.tar.gz.sig | Bin 72 -> 0 bytes libmicrohttpd.changes | 7 +++++ libmicrohttpd.keyring | 44 -------------------------------- libmicrohttpd.spec | 17 +++++------- 5 files changed, 14 insertions(+), 57 deletions(-) delete mode 100644 libmicrohttpd-0.9.27.tar.gz delete mode 100644 libmicrohttpd-0.9.27.tar.gz.sig delete mode 100644 libmicrohttpd.keyring diff --git a/libmicrohttpd-0.9.27.tar.gz b/libmicrohttpd-0.9.27.tar.gz deleted file mode 100644 index 440502c..0000000 --- a/libmicrohttpd-0.9.27.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d532edf64c3a9da472114c2d10fc94606e3b31f21b883ec2e796ab8478f7e9cb -size 879531 diff --git a/libmicrohttpd-0.9.27.tar.gz.sig b/libmicrohttpd-0.9.27.tar.gz.sig deleted file mode 100644 index 209a191223c74ce4d4f0e271145855e45a6b0281f9b03a949450d1671decc2c8..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 72 zcmV-O0Jr~$Mg#y60ssaD0#SyfGyn<-5Wiq>i%3FjexybKpLNsTl$_16t0~PQb~ege eOF(Wi$pD@v5<;rbsNY^p!R1=j&+y#7t>oW@< diff --git a/libmicrohttpd.changes b/libmicrohttpd.changes index b9f74b2..091164e 100644 --- a/libmicrohttpd.changes +++ b/libmicrohttpd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jun 5 16:42:38 UTC 2013 - jengelh@inai.de + +- More robust make install call +- Remove redundant %clean section +- Requires(pre) is useless without a %pre script + ------------------------------------------------------------------- Thu May 16 07:42:59 UTC 2013 - mvyskocil@suse.com diff --git a/libmicrohttpd.keyring b/libmicrohttpd.keyring deleted file mode 100644 index fb0f119..0000000 --- a/libmicrohttpd.keyring +++ /dev/null @@ -1,44 +0,0 @@ -pub 1024D/48426C7E 2006-12-18 -uid Christian Grothoff -sub 4096g/6433E483 2006-12-18 - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.19 (GNU/Linux) - -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 -=b/hy ------END PGP PUBLIC KEY BLOCK----- diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index 7b3c672..e484e01 100644 --- a/libmicrohttpd.spec +++ b/libmicrohttpd.spec @@ -22,7 +22,11 @@ Name: libmicrohttpd Version: 0.9.27 Release: 0 +Summary: Small Embeddable HTTP Server Library +License: LGPL-2.1+ +Group: Productivity/Networking/Web/Servers Url: http://gnunet.org/libmicrohttpd/ + Source0: http://ftpmirror.gnu.org/libmicrohttpd/%{name}-%{version}.tar.gz Source1: http://ftpmirror.gnu.org/libmicrohttpd/%{name}-%{version}.tar.gz.sig Source2: libmicrohttpd.keyring @@ -30,7 +34,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libcurl-devel BuildRequires: libgcrypt-devel >= 1.2.4 BuildRequires: libtasn1-devel - %if 0%{?suse_version} BuildRequires: libgnutls-devel BuildRequires: pkg-config @@ -42,10 +45,6 @@ BuildRequires: gnutls-devel BuildRequires: pkgconfig %endif -Summary: Small Embeddable HTTP Server Library -License: LGPL-2.1+ -Group: Productivity/Networking/Web/Servers - %description GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application. GNU libmicrohttpd is free software @@ -105,7 +104,8 @@ application, check it out. %package devel Requires: %{name}%{soname} = %{version} -Requires(pre): info +Requires(post): info +Requires(postun): info Summary: Small Embeddable HTTP Server Library Group: Development/Libraries/C and C++ @@ -148,7 +148,7 @@ application, check it out. %__make %{?_smp_mflags} %install -%makeinstall +make install DESTDIR="%buildroot" find %{buildroot} -name "*.la" -delete %check @@ -190,9 +190,6 @@ find %{buildroot} -name "*.la" -delete %install_info_delete --info-dir=%{_infodir} %{_infodir}/libmicrohttpd-tutorial.info%{ext_info} %endif -%clean -test "%{buildroot}" != "/" && %__rm -rf "%{buildroot}" - %files -n %{name}%{soname} %defattr(-,root,root) %{_libdir}/%{name}.so.%{soname}