rpm/nedit
SHA256
1
0
Fork 0
forked from pool/nedit
Code Pull Requests Activity

Accepting request 494619 from home:scarabeus_iv:branches:editors

Browse Source 
- Cleanup with spec-cleaner
- Use tagged 5.7 release:
  * few fixes over the git version from bellow
- Refresh patch nedit-5.6_builddate_fix.patch
- Do not compress manpages manualy but rely on brp services

OBS-URL: https://build.opensuse.org/request/show/494619
OBS-URL: https://build.opensuse.org/package/show/editors/nedit?expand=0&rev=18
This commit is contained in:
Martin Pluskal 2017-05-11 12:38:04 +00:00 committed by Git OBS Bridge
parent 99c9531454
commit ab77703eb3
6 changed files with 73 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nedit-5.6_GIT20151030-src.tar.bz2
View File

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

32
nedit-5.6_builddate_fix.patch
View File

@ -1,7 +1,7 @@
diff --git a/source/help.c b/source/help.c Index: nedit-5.7/source/help.c
index 7da0d4b..09dbf6c 100644 ===================================================================
--- a/source/help.c --- nedit-5.7.orig/source/help.c
+++ b/source/help.c +++ nedit-5.7/source/help.c
@@ -229,8 +229,7 @@ static const char *getBuildInfo(void) @@ -229,8 +229,7 @@ static const char *getBuildInfo(void)
{ {
static const char *bldFormat = static const char *bldFormat =
@ -21,10 +21,10 @@ index 7da0d4b..09dbf6c 100644
stabilities[stab], XmVERSION, XmREVISION, XmUPDATE_LEVEL, stabilities[stab], XmVERSION, XmREVISION, XmUPDATE_LEVEL,
XmVERSION_STRING, XmVERSION_STRING,
xmUseVersion/1000, xmUseVersion%1000, xmUseVersion/1000, xmUseVersion%1000,
diff --git a/source/linkdate.c b/source/linkdate.c Index: nedit-5.7/source/linkdate.c
index 6ead1db..7711943 100644 ===================================================================
--- a/source/linkdate.c --- nedit-5.7.orig/source/linkdate.c
+++ b/source/linkdate.c +++ nedit-5.7/source/linkdate.c
@@ -33,6 +33,3 @@ @@ -33,6 +33,3 @@
#ifdef HAVE_DEBUG_H #ifdef HAVE_DEBUG_H
#include "../debug.h" #include "../debug.h"
@ -32,20 +32,20 @@ index 6ead1db..7711943 100644
- -
-const char linkdate[] = __DATE__; -const char linkdate[] = __DATE__;
-const char linktime[] = __TIME__; -const char linktime[] = __TIME__;
diff --git a/source/nc.c b/source/nc.c Index: nedit-5.7/source/nc.c
index db2ed5a..59476aa 100644 ===================================================================
--- a/source/nc.c --- nedit-5.7.orig/source/nc.c
+++ b/source/nc.c +++ nedit-5.7/source/nc.c
@@ -1002,10 +1002,7 @@ static void copyCommandLineArg(CommandLine *commandLine, const char *arg) @@ -1002,10 +1002,6 @@ static void copyCommandLineArg(CommandLi
static void printNcVersion(void ) { static void printNcVersion(void ) {
static const char *const ncHelpText = \ static const char *const ncHelpText = \
"nc (NEdit) Version 5.6 (November 2009)\n\n\ "nc (NEdit) Version 5.7 (January 2017)\n\n\
- Built on: %s, %s, %s\n\ - Built on: %s, %s, %s\n\
- Built at: %s, %s\n"; - Built at: %s, %s\n";
+ Built on: openSUSE BuildService\n"; -
- fprintf(stdout, ncHelpText, - fprintf(stdout, ncHelpText,
- COMPILE_OS, COMPILE_MACHINE, COMPILE_COMPILER, - COMPILE_OS, COMPILE_MACHINE, COMPILE_COMPILER,
- __DATE__, __TIME__); - __DATE__, __TIME__);
+ Built on: openSUSE BuildService\n";
+ fprintf(stdout, ncHelpText); + fprintf(stdout, ncHelpText);
} }

3
nedit-5.7-src.tar.gz Normal file
View File

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

9
nedit.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu May 11 12:03:48 UTC 2017 - tchvatal@suse.com
- Cleanup with spec-cleaner
- Use tagged 5.7 release:
* few fixes over the git version from bellow
- Refresh patch nedit-5.6_builddate_fix.patch
- Do not compress manpages manualy but rely on brp services
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 30 07:41:30 UTC 2015 - opensuse@dstoecker.de Fri Oct 30 07:41:30 UTC 2015 - opensuse@dstoecker.de

86
nedit.spec
View File

@ -1,17 +1,29 @@
#
# spec file for package nedit
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: nedit Name: nedit
Version: 5.6_GIT20151030 Version: 5.7
Release: 1 Release: 0
License: GPL-2.0+
Url: http://sourceforge.net/projects/nedit/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: openmotif-devel update-desktop-files
%if 0%{?suse_version} <= 1010
BuildRequires: xorg-x11-devel
%endif
BuildRequires: bison
Group: Productivity/Editors/Other
Summary: A GUI text editor Summary: A GUI text editor
Source0: %{name}-%{version}-src.tar.bz2 License: GPL-2.0+
Group: Productivity/Text/Editors
Url: http://sourceforge.net/projects/nedit/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz
Source1: %{name}-icon.png Source1: %{name}-icon.png
Source2: %{name}.desktop Source2: %{name}.desktop
#PATCH-FIX-OPENSUSE Use optflags for build #PATCH-FIX-OPENSUSE Use optflags for build
@ -25,7 +37,11 @@ Patch4: %{name}-5.5-visfix.patch
#PATCH-FIX-OPENSUSE do not use UTF-8 by default, as it is not supported #PATCH-FIX-OPENSUSE do not use UTF-8 by default, as it is not supported
Patch5: %{name}-5.5CVS-utf8.patch Patch5: %{name}-5.5CVS-utf8.patch
#PATCH-FIX-OPENSUSE do not include data and time in binary #PATCH-FIX-OPENSUSE do not include data and time in binary
PATCH6: %{name}-5.6_builddate_fix.patch Patch6: %{name}-5.6_builddate_fix.patch
BuildRequires: bison
BuildRequires: openmotif-devel
BuildRequires: update-desktop-files
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
NEdit is a GUI style plain text editor for workstations with the X Window System NEdit is a GUI style plain text editor for workstations with the X Window System
@ -34,53 +50,41 @@ mouse support, macro extension language, syntax highlighting,
and a lot other nice features (and extensions for programmers). and a lot other nice features (and extensions for programmers).
%prep %prep
%setup -q -n %{name} %setup -q
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p0 %patch5
%patch6 -p1 %patch6 -p1
%build %build
%if 0%{?suse_version} <= 1010 make -j1 RPM_OPT_FLAGS="%{optflags}" linux
make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -L/usr/X11R6/%{_lib}" \
linux
%endif
%if 0%{?suse_version} > 1010
make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" \
linux
%endif
pushd doc pushd doc
make all make -j1 all
popd popd
%install %install
install -d -m 755 $RPM_BUILD_ROOT%{_bindir} install -d -m 755 %{buildroot}%{_bindir}
install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man1 install -d -m 755 %{buildroot}%{_mandir}/man1
mv source/nc source/nedit-client mv source/nc source/nedit-client
install -s -m 755 source/nedit source/nedit-client $RPM_BUILD_ROOT%{_bindir} install -s -m 755 source/nedit source/nedit-client %{buildroot}%{_bindir}
gzip doc/*.man install -m 644 doc/nedit.man %{buildroot}%{_mandir}/man1/nedit.1x
install -m 644 doc/nedit.man.gz $RPM_BUILD_ROOT%{_mandir}/man1/nedit.1x.gz mv doc/nc.man doc/nedit-client.man
mv doc/nc.man.gz doc/nedit-client.man.gz install -m 644 doc/nedit-client.man %{buildroot}%{_mandir}/man1/nedit-client.1x
install -m 644 doc/nedit-client.man.gz $RPM_BUILD_ROOT%{_mandir}/man1/nedit-client.1x.gz mkdir -p %{buildroot}%{_datadir}/pixmaps/
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/ mkdir -p %{buildroot}%{_datadir}/applications/
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/ install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/
install -m 644 %{S:1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/ install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/applications/
install -m 644 %{S:2} $RPM_BUILD_ROOT%{_datadir}/applications/ %suse_update_desktop_file %{name} TextEditor
%suse_update_desktop_file %name TextEditor
%clean
rm -rf "$RPM_BUILD_ROOT"
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc doc/nedit.doc README ReleaseNotes %doc doc/nedit.doc README ReleaseNotes
%{_mandir}/*/* %{_mandir}/*/*
%{_bindir}/* %{_bindir}/*
%{_prefix}/share/applications/* %{_datadir}/applications/*
%{_datadir}/pixmaps/nedit-icon.png %{_datadir}/pixmaps/nedit-icon.png
%changelog %changelog

15
update.sh
View File

@ -1,15 +0,0 @@
#! /bin/bash
NAME=nedit
git clone git://git.code.sf.net/p/nedit/git ${NAME}
osc rm $NAME-*.tar.bz2
REV=`sed -n 's/RELEASE=nedit-\([0-9.]\+\).*/\1/p' ${NAME}/Makefile`
#REV=`sed -n 's/.*NEDIT_VERSION \+\([0-9.]\+\).*/\1/p' ${NAME}/source/nedit.h`.`sed -n 's/.*NEDIT_REVISION \+\([0-9.]\+\).*/\1/p' ${NAME}/source/nedit.h`
date=`date -u +"%Y%m%d"`
rev=${REV}_GIT$date
ARC=$NAME-${REV}_GIT$date-src.tar.bz2
tar -cjf $ARC $NAME --exclude "CVS" --exclude ".cvsignore"
rm -rf $NAME
echo "New revision $rev"
sed -i "s/\(Version: \+\).\+/\1$rev/;" ${NAME}.spec
osc add $ARC