GNOME.org
 

[girl] Add man page, update RPM spec for Fedora 21, prepare version 0.5.2.

commit 9108c6648f05aa533c1283071db0ff50ef5d1136
Author: Ole Aamot <oka oka no>
Date:   Sat Nov 29 19:10:23 2014 +0100

    Add man page, update RPM spec for Fedora 21, prepare version 0.5.2.

 .gitignore   |   62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ChangeLog    |    6 +++++
 Makefile.am  |    2 +-
 Makefile.in  |    2 +-
 NEWS         |    6 +++++
 configure    |   23 +++++++++++----------
 configure.ac |    3 +-
 girl.spec.in |   14 ++++++++----
 8 files changed, 99 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..88ad4eb
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,62 @@
+/*.bak
+/*.o
+/*.orig
+/*.rej
+/*.tab.c
+/*~
+/.*.sw[nop]
+/.deps
+/.dirstamp
+/.gitignore
+/GPATH
+/GRTAGS
+/GSYMS
+/GTAGS
+/ID
+/Makefile
+/Makefile.in
+/TAGS
+/aclocal.m4
+/autom4te.cache
+/config.cache
+/config.guess
+/config.h
+/config.h.in
+/config.log
+/config.lt
+/config.status
+/config.status.lineno
+/config.sub
+/configure
+/configure.lineno
+/depcomp
+/gtk-doc.make
+/install-sh
+/intltool-extract
+/intltool-extract.in
+/intltool-merge
+/intltool-merge.in
+/intltool-update
+/intltool-update.in
+/libtool
+/ltmain.sh
+/missing
+/mkinstalldirs
+/po/*.gmo
+/po/*.header
+/po/*.mo
+/po/*.sed
+/po/*.sin
+/po/.intltool-merge-cache
+/po/Makefile
+/po/Makefile.in
+/po/Makefile.in.in
+/po/Makefile.in.in~
+/po/Makevars.template
+/po/POTFILES
+/po/Rules-quot
+/po/eog.pot
+/po/stamp-it
+/so_locations
+/stamp-h1
+/tags
diff --git a/ChangeLog b/ChangeLog
index 2ad274b..09c3d15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2014-11-29  Ole Aamot  <oka oka no>
 
+       * configure.ac: girl version 0.5.2.
+       * girl.spec.in: Update package spec for Fedora 21.
+       * man/girl.1: Add man page.
+
+2014-11-29  Ole Aamot  <oka oka no>
+
        * AUTHORS: Add Мирослав Николић/Miroslav Nikolić (Serbian translation).
        * NEWS: girl 0.5.1 released.
        * po/sr.po: Serbian translation by Мирослав Николић
diff --git a/Makefile.am b/Makefile.am
index 8bc4f60..739ba8d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = data src po
+SUBDIRS = data man src po
 
 datadir = @datadir@
 
diff --git a/Makefile.in b/Makefile.in
index b7d7a66..ca8b0ce 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -314,7 +314,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = data src po
+SUBDIRS = data man src po
 EXTRA_DIST = config.rpath m4/ChangeLog  \
        Makefile \
        ChangeLog \
diff --git a/NEWS b/NEWS
index 7caf4ff..069fae4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 2014-11-29  Ole Aamot  <oka oka no>
 
+       * girl version 0.5.2 release.
+       * girl.spec.in: Update package spec for Fedora 21.
+       * man/girl.1: Add man page.
+
+2014-11-29  Ole Aamot  <oka oka no>
+
        * AUTHORS: Add Мирослав Николић/Miroslav Nikolić (Serbian translation).
        * NEWS: girl 0.5.1 released.
        * po/sr.po: Serbian translation by Мирослав Николић
diff --git a/configure b/configure
index 238f70c..6d00be4 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for girl 0.5.1.
+# Generated by GNU Autoconf 2.69 for girl 0.5.2.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='girl'
 PACKAGE_TARNAME='girl'
-PACKAGE_VERSION='0.5.1'
-PACKAGE_STRING='girl 0.5.1'
+PACKAGE_VERSION='0.5.2'
+PACKAGE_STRING='girl 0.5.2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1324,7 +1324,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures girl 0.5.1 to adapt to many kinds of systems.
+\`configure' configures girl 0.5.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1390,7 +1390,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of girl 0.5.1:";;
+     short | recursive ) echo "Configuration of girl 0.5.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1489,7 +1489,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-girl configure 0.5.1
+girl configure 0.5.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1854,7 +1854,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by girl $as_me 0.5.1, which was
+It was created by girl $as_me 0.5.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2717,7 +2717,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='girl'
- VERSION='0.5.1'
+ VERSION='0.5.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6014,7 +6014,7 @@ _ACEOF
 
 
 
-ac_config_files="$ac_config_files Makefile data/Makefile data/girl.desktop.in data/pixmaps/Makefile 
data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/24x24/Makefile 
data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/256x256/Makefile po/Makefile.in src/Makefile 
girl.spec"
+ac_config_files="$ac_config_files Makefile data/Makefile data/girl.desktop.in data/pixmaps/Makefile 
data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/24x24/Makefile 
data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/256x256/Makefile man/Makefile po/Makefile.in 
src/Makefile girl.spec"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -6550,7 +6550,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by girl $as_me 0.5.1, which was
+This file was extended by girl $as_me 0.5.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6616,7 +6616,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-girl config.status 0.5.1
+girl config.status 0.5.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -6760,6 +6760,7 @@ do
     "data/icons/32x32/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/32x32/Makefile" ;;
     "data/icons/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/48x48/Makefile" ;;
     "data/icons/256x256/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/256x256/Makefile" ;;
+    "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "girl.spec") CONFIG_FILES="$CONFIG_FILES girl.spec" ;;
diff --git a/configure.ac b/configure.ac
index 6dd6e57..4591bff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(girl, 0.5.1)
+AC_INIT(girl, 0.5.2)
 AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
 AC_CONFIG_SRCDIR([src/girl.c])
 AC_CONFIG_HEADER([config.h])
@@ -64,6 +64,7 @@ data/icons/24x24/Makefile
 data/icons/32x32/Makefile
 data/icons/48x48/Makefile
 data/icons/256x256/Makefile
+man/Makefile
 po/Makefile.in
 src/Makefile
 girl.spec
diff --git a/girl.spec.in b/girl.spec.in
index 1af54ae..376eef3 100644
--- a/girl.spec.in
+++ b/girl.spec.in
@@ -1,8 +1,6 @@
 %define name @PACKAGE@
 %define ver @VERSION@
 %define rel 1
-%define prefix %{_usr}
-%define docdir %{_defaultdocdir}
 Summary: GNOME 2.0 Internet Radio Locator program
 Name: %{name}
 Version: %{ver}
@@ -18,7 +16,7 @@ Requires: libxml2 >= 2.9.1
 Requires: gnome-vfs2 >= 2.24.4
 Requires: libgnomeui >= 2.24.5
 Requires: totem >= 3.10.1
-BuildRequires: /usr/bin/gcc gtk2-devel libgnome-devel libxml2-devel gnome-vfs2-devel libgnomeui-devel 
intltool
+BuildRequires: gtk2-devel libgnome-devel libxml2-devel gnome-vfs2-devel libgnomeui-devel intltool
 
 %description
 Girl is a GNOME Internet Radio Locator program that allow users
@@ -43,13 +41,12 @@ Enjoy Internet Radio.
 
 mkdir -p %{buildroot}%{_bindir}
 
-%find_lang %{name}
+%find_lang %{name} --with-man
 
 %clean
 rm -rf %{buildroot}
 
 %files -f %{name}.lang
-%defattr (-,root,root)
 %doc AUTHORS COPYING LETTER NEWS README TODO YP-DIRS
 %lang(cs)
 %lang(pt_BR)
@@ -74,8 +71,15 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/48x48/apps/girl.png
 %{_datadir}/icons/hicolor/256x256/apps/girl.png
 %{_datadir}/icons/hicolor/icon-theme.cache
+%{_mandir}/man1/girl.1.gz
 
 %changelog
+* Sat Nov 29 2014 Ole Aamot - 0.5.2-1
+- Girl 0.5.2 build on Fedora Linux 21
+
+* Sat Nov 29 2014 Ole Aamot - 0.5.1-1
+- Girl 0.5.1 build on Fedora Linux 21
+
 * Sat Nov 29 2014 Ole Aamot - 0.5.0-1
 - Girl 0.5.0 build on Fedora Linux 21
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]