Changeset 495

Timestamp:

Nov 9, 2015, 7:16:24 PM (9 years ago)

Author:

katerina

Message:

Fix for ticket #392 (make rpm broken).

Location:

trunk

Files:

• Makefile.in (modified) (2 diffs)
• docs/Changelog (modified) (1 diff)
• samhain.spec.in (modified) (1 diff)
• scripts/redhat_i386.client.spec.in (modified) (1 diff)
• scripts/samhain.spec.in (modified) (1 diff)

trunk/Makefile.in

@@ -835 +835 @@
         echo $(top_srcdir)/docs/README.UPGRADE           >> debian/docs; \
         echo $(top_srcdir)/docs/README.win2K             >> debian/docs; \
-        echo $(top_srcdir)/docs/TODO                     >> debian/docs; \
         $(MAKE) deb-run
 
@@ -921 +920 @@
         @RPMTOP=`cat ~/.rpmmacros 2>/dev/null | grep '%_topdir' | awk '{ print $$2}'`; \
         if test x"$$RPMTOP" = x; then RPMTOP=/usr/src; fi; \
+        if ! test -d "$$RPMTOP"; then \
+          RPMTOP=`echo $$HOME/rpmbuild`; \
+        fi; \
         echo "Searching the RPM package below $$RPMTOP ..."; \
         RPMFILE=`find $$RPMTOP -follow -maxdepth 4 -cnewer ./samhain.spec 2>/dev/null | grep '@install_name@-$(VERSION)' | grep '\.rpm' | grep -v '\.src\.'`; \

trunk/docs/Changelog

@@ +1 @@
+        * fix broken 'rpm' and 'rpm-light' makefile targets
+        (reported by Bond)
+
 4.1.1:
         * fix problem with timezone calculation on month rollover for

trunk/samhain.spec.in

@@ -191 +191 @@
 %dir @mylockdir@
 %dir @mylogdir@
-%doc docs/BUGS COPYING docs/Changelog docs/TODO
+%doc docs/BUGS COPYING docs/Changelog 
 %doc LICENSE docs/FAQ.html docs/HOWTO* docs/MANUAL-2_4.* docs/README*
 @mydataroot@

trunk/scripts/redhat_i386.client.spec.in

@@ -129 +129 @@
 %dir /var/run
 %dir /var/log
-#%doc docs/BUGS COPYING docs/Changelog docs/TODO
+#%doc docs/BUGS COPYING docs/Changelog 
 #%doc LICENSE docs/HOWTO* docs/MANUAL-2_4.* docs/README*
 /etc

trunk/scripts/samhain.spec.in

@@ -114 +114 @@
 %dir %{_localstatedir}/run
 %dir %{_localstatedir}/log
-%doc docs/BUGS COPYING docs/Changelog docs/TODO
+%doc docs/BUGS COPYING docs/Changelog 
 %doc LICENSE docs/HOWTO* docs/MANUAL-2_4.* docs/README*
 %{_localstatedir}/lib/%{name}