Changeset 265 for trunk

Timestamp:

Dec 29, 2008, 3:09:02 PM (16 years ago)

Author:

joergs

Message:

make changes for SL 11.1

Location:

trunk/dasscm

Files:

• SOURCES (modified) (1 diff)
• dasscm.spec (modified) (3 diffs)
• debian/rules (modified) (1 diff)
• subversion-servers.dass-it (moved) (moved from trunk/dasscm/servers.dass-it )

trunk/dasscm/SOURCES

@@ -1 +1 @@
 dasscm
 Changes
-servers.dass-it
+subversion-servers.dass-it
 dasscm.conf
 doc

trunk/dasscm/dasscm.spec

@@ -23 +23 @@
 %endif
 
-# openSUSE 11.1 build fails, because /etc/subversion/ is not defined.
-# Therefore subversion is included in build.
-# It wasn't included for all distributions
-# because it isn't available for all distributions in the default repository
+# Subversion should be installed during build 
+# to have the directory /etc/subversion/ available.
+# Unfortunally, it isn't included in all distributions,
+# therefore we added some checks
 %if 0%{?suse_version} > 1100
 BuildRequires:  subversion
@@ -49 +49 @@
 mkdir -p $RPM_BUILD_ROOT/usr/bin/
 install -m 755 dasscm $RPM_BUILD_ROOT/usr/bin/
-mkdir -p $RPM_BUILD_ROOT/etc/subversion/
-install -m 644 servers.dass-it $RPM_BUILD_ROOT/etc/subversion/
 install -m 640 dasscm.conf $RPM_BUILD_ROOT/etc/
 mkdir -p $RPM_BUILD_ROOT/var/lib/dasscm/
+if -d $RPM_BUILD_ROOT/etc/subversion/
+        install -m 644 subversion-servers.dass-it $RPM_BUILD_ROOT/etc/subversion/servers.dass-it
+fi
+
+
 
 
@@ -66 +69 @@
 /etc/subversion/servers.dass-it
 %config(noreplace) /etc/dasscm.conf
-%doc Changes doc/*
+%doc Changes doc/* subversion-servers.dass-it

trunk/dasscm/debian/rules

@@ -66 +66 @@
         install -m 0755 dasscm $(CURDIR)/debian/dasscm/usr/bin
         install -m 0644 dasscm.conf $(CURDIR)/debian/dasscm/etc
-        install -m 0644 servers.dass-it $(CURDIR)/debian/dasscm/etc/subversion
+        install -m 0644 subversion-servers.dass-it $(CURDIR)/debian/dasscm/etc/subversion/servers.dass-it
 
 # Build architecture-independent files here.