Merge pull request #11 from spiiroin/jb26919_remove_yaml

Remove old spectacle cruft.

... and package content changes to be dealt separately if/when needed.

rpm/libiphb.spec

@@ -1,21 +1,11 @@
-# 
-# Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.27
-# 
-
 Name:       libiphb
-
-# >> macros
-# << macros
-
 Summary:    API for IP Heartbeat service
 Version:    1.2.2
 Release:    0
 Group:      System/System Control
 License:    LGPLv2+
 URL:        http://github.com/nemomobile/libiphb
 Source0:    %{name}-%{version}.tar.bz2
-Source100:  libiphb.yaml
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires:  pkgconfig(glib-2.0)
@@ -49,33 +39,20 @@ Tests package to test IP Heartbeat functionality.
 %prep
 %setup -q -n %{name}-%{version}
 
-# >> setup
-# << setup
-
 %build
 unset LD_AS_NEEDED
-# >> build pre
 ./verify_version.sh
 chmod a+x autogen.sh
 ./autogen.sh
 chmod a+x configure
-# << build pre
 
 %configure --disable-static
 make %{?_smp_mflags}
 
-# >> build post
-# << build post
-
 %install
 rm -rf %{buildroot}
-# >> install pre
-# << install pre
 %make_install
 
-# >> install post
-# << install post
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -84,17 +61,13 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_libdir}/libiphb.so.*
 %doc COPYING AUTHORS INSTALL README NEWS ChangeLog
-# >> files
-# << files
 
 %files devel
 %defattr(-,root,root,-)
 %attr(644,root,root)%{_includedir}/iphbd/*
 %{_libdir}/libiphb.so
 %{_libdir}/pkgconfig/libiphb.pc
 %doc COPYING
-# >> files devel
-# << files devel
 
 %files tests
 %defattr(-,root,root,-)
@@ -103,5 +76,3 @@ rm -rf %{buildroot}
 /opt/tests/%{name}-tests/bin/hbtest3
 /opt/tests/%{name}-tests/tests.xml
 %doc COPYING
-# >> files tests
-# << files tests

verify_version.sh

@@ -25,18 +25,6 @@ if [ "$SPEC_VERS" != "$AC_VERS" ]; then
   fi
 fi
 
-# The yaml file is included in the git tree, but might not be available
-# when making package build via OBS ...
-YAML_PATH=${RPM_SOURCE_DIR:-rpm}/${RPM_PACKAGE_NAME:-libiphb}.yaml
-
-if [ -f $YAML_PATH ]; then
-  YAML_VERS=$(grep '^Version:' $YAML_PATH |sed -e 's/^.*:[[:space:]]*//')
-  if [ "$YAML_VERS" != "$AC_VERS" ]; then
-    echo >&2 "$AC_PATH=$AC_VERS vs $YAML_PATH=$YAML_VERS"
-    RES=1
-  fi
-fi
-
 # Having debian/changelog out of sync is not a show stopper
 DEB_PATH=debian/changelog
 DEB_VERS=$(head -1 $DEB_PATH | sed -e 's/^.*(//' -e 's/).*$//')