RPM packaging

* Relax configure dependencies for Centos 6
* Add and distribute spec file

diff --git a/.gitignore b/.gitignore
index 6701ec3..58f849f 100755 (executable)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*~
 stamp-h1
 *.stamp
 *.exe
@@ -80,6 +81,8 @@ m4/xsize.m4
 moonshot.msi
 moonshot.wixpdb
 po/Makefile.in.in
+moonshot-ui.spec
+
 app.wixobj
 org.janet.Moonshot.service
 share/
@@ -90,5 +93,7 @@ libmoonshot/moonshot-msrpc_c.c
 libmoonshot/moonshot-msrpc_s.c
 libmoonshot/libmoonshot.exp
 libmoonshot/libmoonshot.lib
+*.tar.gz
+
 *.tar.bz2
 *.stackdump

diff --git a/Makefile.am b/Makefile.am
index 27700b7..5b6b1fa 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -139,7 +139,8 @@ libmoonshot_libmoonshot_la_SOURCES += libmoonshot/libmoonshot-dbus.c
 CLEANFILES = $(dbusservice_DATA)
 endif
 
-EXTRA_DIST = webprovisioning/moonshot.xml $(dbusservice_in_files)
+EXTRA_DIST = webprovisioning/moonshot.xml $(dbusservice_in_files) \
+       moonshot-ui.spec
 
 noinst_PROGRAMS = \
         examples/client \

diff --git a/configure.ac b/configure.ac
index 97c98e9..3c268fb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 AC_PREREQ([2.66])
-AC_INIT([Moonshot],
+AC_INIT([Moonshot-ui],
         [0.1],
-        [BUG-REPORT-ADDRESS],
-        [moonshot])
+        [moonshot-community@jiscmail.ac.uk],
+        [moonshot-ui])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([configure.ac])
@@ -16,7 +16,7 @@ AM_MAINTAINER_MODE([enable])
 LT_PREREQ([2.2])
 LT_INIT([win32-dll])
 
-PKG_PROG_PKG_CONFIG([0.24])
+PKG_PROG_PKG_CONFIG([0.23])
 
 # Platform checks
 AC_CANONICAL_HOST
@@ -137,9 +137,9 @@ AC_SUBST(MOONSHOT_WEBP)
 # Dependencies
 PKG_CHECK_MODULES(moonshot,[
         atk >= 1.20
-        glib-2.0 >= 2.24
-        gobject-2.0 >= 2.24
-        gtk+-2.0 >= 2.20
+        glib-2.0 >= 2.22
+        gobject-2.0 >= 2.22
+        gtk+-2.0 >= 2.18
         $SERVER_IPC_MODULE
 ])
 
@@ -159,6 +159,7 @@ AC_CONFIG_FILES([
         po/Makefile.in
         moonshot.desktop
         moonshot-webp.desktop
+       moonshot-ui.spec
 ])
 
 AC_OUTPUT

diff --git a/moonshot-ui.spec.in b/moonshot-ui.spec.in
new file mode 100644 (file)
index 0000000..2212f7c
--- /dev/null
+++ b/moonshot-ui.spec.in
@@ -0,0 +1,76 @@
+Name:           @PACKAGE@
+Version:        @VERSION@
+Release:        1%{?dist}
+Summary:        Moonshot Federated Identity User Interface
+
+Group:          Security Tools
+License:        BSD
+URL:            http://www.project-moonshot.org/
+Source0:       %{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires:         glib-devel
+BuildRequires:         gtk2-devel
+BuildRequires:         dbus-devel
+BuildRequires:                 dbus-glib-devel
+BuildRequires:                 desktop-file-utils
+BuildRequires:                 shared-mime-info
+
+#Requires:       
+
+%description
+
+
+%prep
+%setup -q
+
+
+%build
+%configure
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+%post
+       /usr/bin/update-desktop-database
+
+%postun
+       /usr/bin/update-desktop-database
+
+%package devel
+Summary: Moonshot UI Development
+
+%description devel
+
+            Moonshot UI development
+
+
+
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/moonshot
+%{_bindir}/moonshot-webp
+%{_datadir}/applications/*
+%{_datadir}/dbus-1/*
+%{_datadir}/mime/packages/*
+%{_libdir}/libmoonshot.so.*
+
+%files devel
+%{_includedir}/*.h
+%{_libdir}/libmoonshot.a
+%{_libdir}/libmoonshot.so*
+%exclude %{_libdir}/*.la
+
+
+
+
+
+
+%changelog