rpms/NaturalDocs/EL-5 NaturalDocs-1.4-paths.patch, NONE, 1.1 NaturalDocs.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/NaturalDocs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv731/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	NaturalDocs-1.4-paths.patch NaturalDocs.spec 
Log Message:
Import into branches

NaturalDocs-1.4-paths.patch:

--- NEW FILE NaturalDocs-1.4-paths.patch ---
Use FHS-compliant system paths.

Lubomir Rintel <lkundrak at v3.sk>

--- NaturalDocs.orig	2008-07-04 12:43:45.000000000 +0200
+++ NaturalDocs	2008-07-04 12:43:53.000000000 +0200
@@ -65,9 +65,6 @@ use 5.005;  # When File::Spec was includ
 
 use English '-no_match_vars';
 
-use FindBin;
-use lib "$FindBin::RealBin/Modules";
-
 sub INIT
     {
     # This function is just here so that when I start the debugger, it doesn't open a new file.  Normally it would jump to an INIT
--- Modules/NaturalDocs/Settings.pm.orig	2008-07-04 12:41:59.000000000 +0200
+++ Modules/NaturalDocs/Settings.pm	2008-07-04 12:43:24.000000000 +0200
@@ -617,17 +617,17 @@ sub ProjectDataDirectory
 # Function: StyleDirectory
 # Returns the main style directory.
 sub StyleDirectory
-    {  return NaturalDocs::File->JoinPaths($FindBin::RealBin, 'Styles', 1);  };
+    {  return '/usr/share/NaturalDocs/Styles';  };
 
 # Function: JavaScriptDirectory
 # Returns the main JavaScript directory.
 sub JavaScriptDirectory
-    {  return NaturalDocs::File->JoinPaths($FindBin::RealBin, 'JavaScript', 1);  };
+    {  return  '/usr/share/NaturalDocs/JavaScript'; };
 
 # Function: ConfigDirectory
 # Returns the main configuration directory.
 sub ConfigDirectory
-    {  return NaturalDocs::File->JoinPaths($FindBin::RealBin, 'Config', 1);  };
+    {  return '/etc/NaturalDocs'; };
 
 # Function: DocumentedOnly
 # Returns whether undocumented code aspects should be included in the output.


--- NEW FILE NaturalDocs.spec ---
Name:           NaturalDocs
Version:        1.4
Release:        2%{?dist}
Summary:        Documentation generator for multiple programming languages

Group:          Development/Tools
License:        GPLv2+
URL:            http://www.naturaldocs.org/
Source0:        http://downloads.sourceforge.net/naturaldocs/%{name}-%{version}.zip
Patch0:         NaturalDocs-1.4-paths.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  dos2unix
Requires:       perl(:MODULE_COMPAT_%(eval $(%{__perl} -V:version); echo $version))

%description
Natural Docs is an open-source documentation generator for multiple
programming languages.  You document your code in a natural syntax that
reads like plain English.  Natural Docs then scans your code and builds
high-quality HTML documentation from it.


%prep
%setup -q -c
%patch0 -p0


%build
# There's a couple of files with DOS line endings
find . -type f -exec dos2unix -q -k '{}' \;

# And one non-UTF8 one
iconv -f ISO-8859-1 -t UTF-8 Help/example/Default.css >Help/example/Default.css.utf8
touch --reference Help/example/Default.css Help/example/Default.css.utf8
mv Help/example/Default.css.utf8 Help/example/Default.css


%install
rm -rf $RPM_BUILD_ROOT

# Directory structure
install -d $RPM_BUILD_ROOT%{_datadir}/NaturalDocs
install -d $RPM_BUILD_ROOT%{_sysconfdir}/NaturalDocs
install -d $RPM_BUILD_ROOT%{perl_vendorlib}
install -d $RPM_BUILD_ROOT%{_bindir}

# Copy files
cp -rp Info JavaScript Styles $RPM_BUILD_ROOT%{_datadir}/NaturalDocs
cp -rp Modules/* $RPM_BUILD_ROOT%{perl_vendorlib}
cp -rp Config/* $RPM_BUILD_ROOT%{_sysconfdir}/NaturalDocs
install -pm 755 NaturalDocs $RPM_BUILD_ROOT%{_bindir}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_datadir}/NaturalDocs
%config(noreplace) %{_sysconfdir}/NaturalDocs
%{perl_vendorlib}/*
%{_bindir}/NaturalDocs
%doc License-GPL.txt
%doc Help/*


%changelog
* Mon Jul 07 2008 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 1.4-2
- Add the forgotten Styles directory

* Fri Jul 04 2008 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 1.4-1
- Initial packaging attempt


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NaturalDocs/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Dec 2008 19:17:02 -0000	1.1
+++ .cvsignore	28 Dec 2008 20:26:08 -0000	1.2
@@ -0,0 +1 @@
+NaturalDocs-1.4.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NaturalDocs/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Dec 2008 19:17:02 -0000	1.1
+++ sources	28 Dec 2008 20:26:08 -0000	1.2
@@ -0,0 +1 @@
+05a9a2a392bd3d6d44d1576e624ba74a  NaturalDocs-1.4.zip