Attachment 878364 Details for Bug 1022165 – Remove versioned symlink

[patch] Remove versioned symlink

0001-Remove-versioned-jar-symlink-rhbz-1022165.patch (text/plain), 2.47 KB, created by Michael Simacek on 2014-03-25 09:58:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Simacek

Created: 2014-03-25 09:58:41 UTC

Size: 2.47 KB

patch

obsolete

>From 9ef25f950a0d7fc90c72155a8dc2d8f0a55b572a Mon Sep 17 00:00:00 2001
>From: Michael Simacek <msimacek@redhat.com>
>Date: Tue, 7 Jan 2014 12:14:49 +0100
>Subject: [PATCH] Remove versioned jar symlink (rhbz#1022165)
>
>Signed-off-by: Michael Simacek <msimacek@redhat.com>
>---
> sphinx.spec | 19 ++++++-------------
> 1 file changed, 6 insertions(+), 13 deletions(-)
>
>diff --git a/sphinx.spec b/sphinx.spec
>index 9cddfc6..a6f9aa0 100644
>--- a/sphinx.spec
>+++ b/sphinx.spec
>@@ -4,9 +4,8 @@
> 
> Name:           sphinx
> Version:        2.1.5
>-Release:        1%{?dist}
>+Release:        2%{?dist}
> Summary:        Free open-source SQL full-text search engine
>-Group:          Applications/Text
> License:        GPLv2+
> URL:            http://sphinxsearch.com
> 
>@@ -55,7 +54,6 @@ Phrase Index. Yes, I know about CMU's Sphinx project.
> 
> %package -n libsphinxclient
> Summary:        Pure C searchd client API library
>-Group:          Development/Libraries
> 
> 
> %description -n libsphinxclient
>@@ -65,7 +63,6 @@ Sphinx search engine, http://sphinxsearch.com/
> 
> %package -n libsphinxclient-devel
> Summary:        Development libraries and header files for libsphinxclient
>-Group:          Development/Libraries
> Requires:       libsphinxclient = %{version}-%{release}
> 
> 
>@@ -76,7 +73,6 @@ Sphinx search engine, http://sphinxsearch.com/
> 
> %package java
> Summary: Java API for Sphinx
>-Group: Development/Libraries
> BuildRequires: java-devel
> Requires: java
> Requires: jpackage-utils
>@@ -90,7 +86,6 @@ designed with indexing database content in mind.
> 
> %package php
> Summary: PHP API for Sphinx
>-Group: Development/Libraries
> Requires: php-common >= 5.1.6
> 
> 
>@@ -196,13 +191,8 @@ popd
> # install the java api
> mkdir -p $RPM_BUILD_ROOT%{_javadir}
> install -m 0644 api/java/%{name}api.jar \
>-    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
>-
>-# convenience symlinks
>-pushd $RPM_BUILD_ROOT%{_javadir}
>-    ln -s %{name}-%{version}.jar %{name}.jar
>-    ln -s %{name}-%{version}.jar %{name}api.jar
>-popd
>+    $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
>+ln -s %{_javadir}/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}api.jar
> 
> # install the php api
> # "Non-PEAR PHP extensions should put their Class files in /usr/share/php."
>@@ -284,6 +274,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/
> %{_datadir}/php/*
> 
> %changelog
>+* Tue Mar 25 2014 Michael Simacek <msimacek@redhat.com> - 2.1.5-2
>+- Remove version from JAR name
>+
> * Sun Jan 26 2014 Peter Robinson <pbrobinson@fedoraproject.org> 2.1.5-1
> - upstream 2.1.5
> 
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 1022165: 846602 | 878364