Author: glen                         Date: Fri Dec  3 10:39:57 2010 GMT
Module: packages                      Tag: NSIS_2_10
---- Log message:
- 2.10 testing, oldest available release with scons build

---- Files affected:
packages/nsis:
   nsis.spec (1.3 -> 1.3.2.1) 

---- Diffs:

================================================================
Index: packages/nsis/nsis.spec
diff -u packages/nsis/nsis.spec:1.3 packages/nsis/nsis.spec:1.3.2.1
--- packages/nsis/nsis.spec:1.3 Thu Dec  2 17:33:44 2010
+++ packages/nsis/nsis.spec     Fri Dec  3 11:39:52 2010
@@ -1,16 +1,15 @@
 # $Revision$, $Date$
 Summary:       Open Source installer build tool for Windows applications
 Name:          nsis
-Version:       2.34
-Release:       1
+Version:       2.10
+Release:       0.2
 License:       zlib/libpng
 Group:         Development/Tools
 URL:           http://nsis.sourceforge.net/
-Source0:       
http://downloads.sourceforge.net/nsis/%{name}-%{version}-src.tar.bz2
-# Source0-md5: 60243c2562710eeac45bda1378e4c88c
+Source0:       
http://downloads.sourceforge.net/nsis/%{name}-%{version}-1-src.tar.bz2
+# Source0-md5: 800cb67e4043b12bc29bd049f8382dca
 Source1:       http://downloads.sourceforge.net/nsis/%{name}-%{version}.zip
-# Source1-md5: 565d17b3ff12dffcf678ec252a892c04
-Patch0:                optflags.patch
+# Source1-md5: a4eca14f4fd429fee18db892e8041484
 BuildRequires: libstdc++-devel
 %ifarch %{x8664}
 BuildRequires: libstdc++32-devel
@@ -28,7 +27,6 @@
 %prep
 %setup -q -n %{name}-%{version}-src -a1
 %{__cp} -aux %{name}-%{version}/* .
-%patch0 -p1
 
 %{__rm} -rf Docs/StrFunc
 
@@ -37,42 +35,50 @@
 # not to mistake.
 cat <<'EOF' > build.sh
 #!/bin/sh
-%scons "$@" \
+%scons \
        APPEND_CCFLAGS="%{rpmcflags}" \
        APPEND_CXXFLAGS="%{rpmcxxflags}" \
        APPEND_LINKFLAGS="%{rpmldflags}" \
-       PREFIX=%{_prefix} \
-       PREFIX_DEST=$RPM_BUILD_ROOT \
-       PREFIX_CONF=%{_sysconfdir} \
+       PREFIX=%{_datadir}/nsis \
        SKIPSTUBS="all" \
        SKIPPLUGINS="all" \
-       SKIPUTILS="Library/RegTool,UIs,Makensisw,zip2exe,MakeLangId,NSIS Menu" \
+       
SKIPUTILS="Library/LibraryLocal,Library/RegTool,UIs,Makensisw,zip2exe,MakeLangId,NSIS
 Menu" \
        SKIPMISC="all" \
        VERSION="%{version}" \
-       STRIP="false"
+       STRIP="false" \
+       "$@"
 EOF
 chmod a+rx build.sh
 ./build.sh
 
 %install
 rm -rf $RPM_BUILD_ROOT
-./build.sh install
-
 install -d $RPM_BUILD_ROOT%{_datadir}/nsis
-cp -fr Bin Contrib Include Menu Plugins Stubs $RPM_BUILD_ROOT%{_datadir}/nsis
+cp -a NSIS.chm Bin Contrib Include Menu Plugins Stubs 
$RPM_BUILD_ROOT%{_datadir}/nsis
+
+sh -x ./build.sh install \
+       PREFIX=$RPM_BUILD_ROOT%{_datadir}/nsis
+
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}}
+#mv $RPM_BUILD_ROOT{%{_datadir}/nsis,%{_bindir}}/makensis
+#mv $RPM_BUILD_ROOT{%{_datadir}/nsis,%{_sysconfdir}}/nsisconf.nsh
+
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -a Examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING Docs Examples
-%config(noreplace) %{_sysconfdir}/nsisconf.nsh
-%attr(755,root,root) %{_bindir}/GenPat
-%attr(755,root,root) %{_bindir}/LibraryLocal
-%attr(755,root,root) %{_bindir}/makensis
+%doc Docs/*
+#%config(noreplace) %{_sysconfdir}/nsisconf.nsh
+#%attr(755,root,root) %{_bindir}/GenPat
+#%attr(755,root,root) %{_bindir}/LibraryLocal
+#%attr(755,root,root) %{_bindir}/makensis
 %{_datadir}/nsis
-%exclude %{_datadir}/doc/nsis
+
+%{_examplesdir}/%{name}-%{version}
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -80,6 +86,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3.2.1  2010/12/03 10:39:52  glen
+- 2.10 testing, oldest available release with scons build
+
 Revision 1.3  2010/12/02 16:33:44  glen
 - needs 32bit libstdc++ on 64bit
 - add exclusive arch for ia archs
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nsis/nsis.spec?r1=1.3&r2=1.3.2.1&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to