Author: glen Date: Thu Jun 10 17:42:45 2010 GMT Module: packages Tag: HEAD ---- Log message: - up to 1.4 (name package as 1.40 to avoid epoch bump)
---- Files affected: packages/NaturalDocs: NaturalDocs-path.patch (1.2 -> 1.3) , NaturalDocs.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: packages/NaturalDocs/NaturalDocs-path.patch diff -u packages/NaturalDocs/NaturalDocs-path.patch:1.2 packages/NaturalDocs/NaturalDocs-path.patch:1.3 --- packages/NaturalDocs/NaturalDocs-path.patch:1.2 Thu Apr 14 18:54:46 2005 +++ packages/NaturalDocs/NaturalDocs-path.patch Thu Jun 10 19:42:40 2010 @@ -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 <[email protected]> + +--- 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 - { ================================================================ Index: packages/NaturalDocs/NaturalDocs.spec diff -u packages/NaturalDocs/NaturalDocs.spec:1.10 packages/NaturalDocs/NaturalDocs.spec:1.11 --- packages/NaturalDocs/NaturalDocs.spec:1.10 Mon Feb 12 22:23:44 2007 +++ packages/NaturalDocs/NaturalDocs.spec Thu Jun 10 19:42:40 2010 @@ -1,19 +1,22 @@ # $Revision$, $Date$ %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 @@ -35,17 +38,22 @@ %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 @@ -53,7 +61,10 @@ %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} @@ -63,6 +74,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.11 2010/06/10 17:42:40 glen +- up to 1.4 (name package as 1.40 to avoid epoch bump) + Revision 1.10 2007/02/12 21:23:44 glen - tabs in preamble @@ -74,7 +88,7 @@ - rel. 2 Revision 1.7 2005/04/14 17:04:37 darekr -- fixed %%install +- fixed %install Revision 1.6 2005/04/14 16:56:00 darekr - updated to 1.35 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/NaturalDocs/NaturalDocs-path.patch?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/NaturalDocs/NaturalDocs.spec?r1=1.10&r2=1.11&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
