- up to 1.4 (name package as 1.40 to avoid epoch bump)

Changed files:
    NaturalDocs-path.patch -> 1.3
    NaturalDocs.spec -> 1.11

diff --git a/NaturalDocs-path.patch b/NaturalDocs-path.patch
index dda81ee55c19156960f6e095beedc0c76a9bc94f..c8872870c27b6fbfbf2fef3a1597179c2195bcd1 100644 (file)
--- a/NaturalDocs-path.patch
+++ b/NaturalDocs-path.patch
@@ -1,33 +1,39 @@
---- NaturalDocs-1.35/Modules/NaturalDocs/Settings.pm.orig      2005-04-14 18:22:22.000000000 +0200
-+++ NaturalDocs-1.35/Modules/NaturalDocs/Settings.pm   2005-04-14 18:23:06.000000000 +0200
-@@ -475,17 +475,17 @@
+Use FHS-compliant system paths.
+
+Lubomir Rintel <lkundrak@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 NaturalDocs::File->JoinPaths('/usr/share/NaturalDocs', '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 NaturalDocs::File->JoinPaths('/usr/share/NaturalDocs', '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 NaturalDocs::File->JoinPaths('/usr/share/NaturalDocs', 'Config', 1);  };
++    {  return '/etc/NaturalDocs'; };
  
  # Function: DocumentedOnly
  # Returns whether undocumented code aspects should be included in the output.
---- NaturalDocs-1.35/NaturalDocs.orig  2005-04-14 18:24:35.000000000 +0200
-+++ NaturalDocs-1.35/NaturalDocs       2005-04-14 18:24:55.000000000 +0200
-@@ -66,7 +66,6 @@
- use English '-no_match_vars';
- 
- use FindBin;
--use lib "$FindBin::RealBin/Modules";
- 
- sub INIT
-     {

diff --git a/NaturalDocs.spec b/NaturalDocs.spec
index 02abc9e272803ab57f496db0fbf750003dd4e0c9..d907122f63859c94a0dfcca7358404f01812f754 100644 (file)
--- a/NaturalDocs.spec
+++ b/NaturalDocs.spec
@@ -1,18 +1,21 @@
 %include       /usr/lib/rpm/macros.perl
+%define                ver             1.4
 Summary:       Multi-language documentation generator
 Summary(pl.UTF-8):     Wielojęzykowy generator dokumentacji
 Name:          NaturalDocs
-Version:       1.35
-Release:       2
+Version:       1.40
+Release:       1
 License:       GPL
 Group:         Applications
-Source0:       http://dl.sourceforge.net/naturaldocs/%{name}-%{version}.zip
-# Source0-md5: 9d3aacda69cb2f94784ac95548e210b5
+Source0:       http://downloads.sourceforge.net/naturaldocs/%{name}-%{ver}.zip
+# Source0-md5: 05a9a2a392bd3d6d44d1576e624ba74a
 Patch0:                %{name}-path.patch
 URL:           http://www.naturaldocs.org/
+BuildRequires: iconv
 BuildRequires: perl-modules >= 1:5.8.0
 BuildRequires: rpm-perlprov >= 4.1-13
 BuildRequires: unzip
+BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -34,17 +37,22 @@ wysokiej jakości wygenerowanej dokumentacji.
 
 %prep
 %setup -q -c
-%patch0 -p1
+%patch0 -p0
+
+# 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
-install -d $RPM_BUILD_ROOT{%{_datadir}/%{name}/{Config,JavaScript},%{_bindir},%{perl_vendorlib}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_datadir}/%{name}/JavaScript,%{_bindir},%{perl_vendorlib}}
 
 mv Modules/%{name} $RPM_BUILD_ROOT%{perl_vendorlib}
 mv Styles $RPM_BUILD_ROOT%{_datadir}/%{name}
-install Config/*.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/Config
-install JavaScript/*.js $RPM_BUILD_ROOT%{_datadir}/%{name}/JavaScript
-install %{name} $RPM_BUILD_ROOT%{_bindir}
+cp -a Config/*.txt $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+cp -a JavaScript/*.js $RPM_BUILD_ROOT%{_datadir}/%{name}/JavaScript
+install -p %{name} $RPM_BUILD_ROOT%{_bindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -52,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc Info/CSSGuide.txt Info/NDMarkup.txt Help/*
-%attr(755,root,root) %{_bindir}/*
+%dir %{_sysconfdir}/%{name}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/Languages.txt
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/Topics.txt
+%attr(755,root,root) %{_bindir}/NaturalDocs
 %{_datadir}/%{name}
 %{perl_vendorlib}/%{name}