[Gpg4win-commits] r541 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2007-09-26 14:09:43 +0200 (Wed, 26 Sep 2007)
New Revision: 541

Modified:
   trunk/ChangeLog
   trunk/src/gpg4win.nsi
   trunk/src/inst-gnupg2.nsi
   trunk/src/inst-sections.nsi
Log:
2007-09-26  Marcus Brinkmann  <marcus at g10code.de>

	* src/inst-gnupg2.nsi: Put it in the read-only section.
	* src/inst-sections.nsi: Make kleopatra dependent on gnupg2, and
	gpgol dependent on kleopatra.  Remove explicit dependencies on
	gnupg and gnupg2 from individual packages.	
	* src/gpg4win.nsi: Remove kleopatra from light installer.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-09-25 17:11:40 UTC (rev 540)
+++ trunk/ChangeLog	2007-09-26 12:09:43 UTC (rev 541)
@@ -1,3 +1,11 @@
+2007-09-26  Marcus Brinkmann  <marcus at g10code.de>
+
+	* src/inst-gnupg2.nsi: Put it in the read-only section.
+	* src/inst-sections.nsi: Make kleopatra dependent on gnupg2, and
+	gpgol dependent on kleopatra.  Remove explicit dependencies on
+	gnupg and gnupg2 from individual packages.	
+	* src/gpg4win.nsi: Remove kleopatra from light installer.
+
 2007-09-25  Marcus Brinkmann  <marcus at g10code.de>
 
 	* src/inst-sections.nsi, src/inst-kleopatra.nsi,

Modified: trunk/src/gpg4win.nsi
===================================================================
--- trunk/src/gpg4win.nsi	2007-09-25 17:11:40 UTC (rev 540)
+++ trunk/src/gpg4win.nsi	2007-09-26 12:09:43 UTC (rev 541)
@@ -30,6 +30,9 @@
 !undef HAVE_PKG_MAN_NOVICE_DE
 !undef HAVE_PKG_MAN_NOVICE_EN
 !undef HAVE_PKG_MAN_ADVANCED_DE
+!ifdef HAVE_PKG_KLEOPATRA
+!undef HAVE_PKG_KLEOPATRA
+!endif
 !ifdef HAVE_PKG_KDELIBS
 !undef HAVE_PKG_KDELIBS
 !endif

Modified: trunk/src/inst-gnupg2.nsi
===================================================================
--- trunk/src/inst-gnupg2.nsi	2007-09-25 17:11:40 UTC (rev 540)
+++ trunk/src/inst-gnupg2.nsi	2007-09-26 12:09:43 UTC (rev 541)
@@ -25,7 +25,8 @@
 !define prefix ${ipdir}/gnupg2-${gpg4win_pkg_gnupg2_version}
 
 
-Section /o "GnuPG2" SEC_gnupg2
+Section "GnuPG2" SEC_gnupg2
+  SectionIn RO
 
   SetOutPath "$INSTDIR"
 !ifdef SOURCES

Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi	2007-09-25 17:11:40 UTC (rev 540)
+++ trunk/src/inst-sections.nsi	2007-09-26 12:09:43 UTC (rev 541)
@@ -314,17 +314,6 @@
 calc_defaults_kleopatra_done:
 !endif
 
-!ifdef HAVE_PKG_GNUPG2
-  g4wihelp::config_fetch_bool "inst_gnupg2"
-  StrCmp $R0 "1" 0 calc_defaults_gnupg2_not_one
-   !insertmacro SelectSection ${SEC_gnupg2}
-   Goto calc_defaults_gnupg2_done
-  calc_defaults_gnupg2_not_one:
-  StrCmp $R0 "0" 0 calc_defaults_gnupg2_done
-   !insertmacro UnselectSection ${SEC_gnupg2}
-calc_defaults_gnupg2_done:
-!endif
-
 !ifdef HAVE_PKG_GPGOL
   g4wihelp::config_fetch_bool "inst_gpgol"
   StrCmp $R0 "1" 0 calc_defaults_gpgol_not_one
@@ -523,8 +512,24 @@
   !insertmacro UnselectSection ${SEC_kdelibs}
 !endif
 
+  # Always install gnupg and gnupg2.  This is also ensured by putting
+  # these packages in the RO section and enabling them by default, but
+  # it doesn't harm to add it explicitely here as well.
+
+  !insertmacro SelectSection ${SEC_gnupg}
+  !insertmacro SelectSection ${SEC_gnupg2}
+
   # Then enable all dependencies in reverse build list order!
 
+!ifdef HAVE_PKG_GPGOL
+  !insertmacro SectionFlagIsSet ${SEC_gpgol} \
+		${SF_SELECTED} have_gpgol skip_gpgol
+  have_gpgol:
+  !insertmacro SelectSection ${SEC_gpgme}
+  !insertmacro SelectSection ${SEC_kleopatra}
+  skip_gpgol:
+!endif
+
 !ifdef HAVE_PKG_GPGEX
   !insertmacro SectionFlagIsSet ${SEC_gpgex} \
 		${SF_SELECTED} have_gpgex skip_gpgex
@@ -537,7 +542,6 @@
   !insertmacro SectionFlagIsSet ${SEC_kleopatra} ${SF_SELECTED} have_kleopatra skip_kleopatra
   have_kleopatra:
   !insertmacro SelectSection ${SEC_gpgme}
-  !insertmacro SelectSection ${SEC_gnupg}
   # This drags in all the other KDE and Qt stuff.
   !insertmacro SelectSection ${SEC_kdelibs}
   skip_kleopatra:
@@ -562,7 +566,6 @@
   !insertmacro SectionFlagIsSet ${SEC_gpgee} ${SF_SELECTED} have_gpgee skip_gpgee
   have_gpgee:
   !insertmacro SelectSection ${SEC_gpgme}
-  !insertmacro SelectSection ${SEC_gnupg}
   skip_gpgee:
 !endif
 
@@ -570,7 +573,6 @@
   !insertmacro SectionFlagIsSet ${SEC_winpt} ${SF_SELECTED} have_winpt skip_winpt
   have_winpt:
   !insertmacro SelectSection ${SEC_gpgme}
-  !insertmacro SelectSection ${SEC_gnupg}
   skip_winpt:
 !endif
 
@@ -582,7 +584,6 @@
   !insertmacro SelectSection ${SEC_libpng}
   !insertmacro SelectSection ${SEC_glib}
   !insertmacro SelectSection ${SEC_gpgme}
-  !insertmacro SelectSection ${SEC_gnupg}
   skip_gpa:
 !endif
 
@@ -595,7 +596,6 @@
   !insertmacro SelectSection ${SEC_jpeg}
   !insertmacro SelectSection ${SEC_glib}
   !insertmacro SelectSection ${SEC_gpgme}
-  !insertmacro SelectSection ${SEC_gnupg}
   !insertmacro SelectSection ${SEC_pthreads_w32}
   !insertmacro SelectSection ${SEC_crypt}
   !insertmacro SelectSection ${SEC_regex}
@@ -612,7 +612,6 @@
   !insertmacro SelectSection ${SEC_jpeg}
   !insertmacro SelectSection ${SEC_glib}
   !insertmacro SelectSection ${SEC_gpgme}
-  !insertmacro SelectSection ${SEC_gnupg}
   !insertmacro SelectSection ${SEC_pthreads_w32}
   !insertmacro SelectSection ${SEC_crypt}
   !insertmacro SelectSection ${SEC_regex}
@@ -661,16 +660,6 @@
   skip_pango:
 !endif
 
-!ifdef HAVE_PKG_GPGOL
-  !insertmacro SectionFlagIsSet ${SEC_gpgol} \
-		${SF_SELECTED} have_gpgol skip_gpgol
-  have_gpgol:
-  !insertmacro SelectSection ${SEC_gpgme}
-  !insertmacro SelectSection ${SEC_gnupg}
-  # FIXME: Add kleopatra dependency.
-  skip_gpgol:
-!endif
-
 !ifdef HAVE_PKG_LIBPNG
   !insertmacro SectionFlagIsSet ${SEC_libpng} \
 		${SF_SELECTED} have_libpng skip_libpng