Move application data files to data folder

diff --git a/Makefile.am b/Makefile.am
index e76aadc..ec5ddf2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,11 @@
 .PHONY: changelog
 
-SUBDIRS = po src pixmaps doc contrib
+SUBDIRS = data po src pixmaps doc contrib
 
 EXTRA_DIST = \
-    grip.desktop \
     CREDITS \
-    grip.spec.in \
     autogen.sh
 
-Applicationsdir = $(datadir)/applications
-Applications_DATA = grip.desktop
-
 ACLOCAL_AMFLAGS = -I m4
 
 LIBTOOL_MACROS = \

diff --git a/configure.ac b/configure.ac
index 20284f2..a1bf393 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -159,12 +159,13 @@ AC_SUBST(LDFLAGS)
 AC_SUBST(ac_aux_dir)
 
 AC_OUTPUT([
-Makefile
-grip.spec
-src/Makefile
-po/Makefile.in
-pixmaps/Makefile
-doc/Makefile
-doc/images/Makefile
-contrib/Makefile
+    Makefile
+    data/grip.spec
+    data/Makefile
+    src/Makefile
+    po/Makefile.in
+    pixmaps/Makefile
+    doc/Makefile
+    doc/images/Makefile
+    contrib/Makefile
 ])

diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644 (file)
index 0000000..3cf4b08
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,10 @@
+
+EXTRA_DIST = \
+    grip.desktop \
+    grip.spec.in
+
+Applicationsdir = $(datadir)/applications
+Applications_DATA = grip.desktop
+
+MAINTAINERCLEANFILES = \
+    Makefile.in

diff --git a/data/grip.desktop b/data/grip.desktop
new file mode 100644 (file)
index 0000000..f600c92
--- /dev/null
+++ b/data/grip.desktop
@@ -0,0 +1,24 @@
+[Desktop Entry]
+Name=Grip
+Name[ca]=Grip
+Name[es]=Grip
+Name[de]=Grip
+Name[fi]=Grip
+Name[zh_CN]=Grip MP3 å<88>¶ä½<9C>ç¨<8B>åº<8F>
+Name[zh_CN.GB2312]=Grip MP3 å<88>¶ä½<9C>ç¨<8B>åº<8F>
+Name[zh_TW]=Grip MP3 製ä½<9C>ç¨<8B>å¼<8F>
+Name[zh_TW.Big5]=Grip MP3 製ä½<9C>ç¨<8B>å¼<8F>
+Comment=CD player/ripper
+Comment[ca]=Reproductor/extractor de CD d'audio
+Comment[es]=Reproductor/extractor de CDs de audio
+Comment[de]=Audio-CDs rippen und MP3s/OGGs kodieren
+Comment[fr]=Lecteur/extracteur de CD audio
+Comment[fi]=CD-audion soitto- ja kopiointiohjelma
+Comment[zh_CN]=Grip 让æ<82>¨è½»æ<9D>¾å<88>¶ä½<9C> MP3 æ<96><87>件
+Comment[zh_CN.GB2312]=Grip 让æ<82>¨è½»æ<9D>¾å<88>¶ä½<9C> MP3 æ<96><87>件
+Comment[zh_TW]=Grip è®<93>æ<82>¨è¼<95>é¬<86>製ä½<9C> MP3 æª<94>
+Comment[zh_TW.Big5]=Grip è®<93>æ<82>¨è¼<95>é¬<86>製ä½<9C> MP3 æª<94>
+Exec=grip
+Icon=gripicon.png
+Type=Application
+Categories=Application;AudioVideo;

diff --git a/data/grip.spec.in b/data/grip.spec.in
new file mode 100644 (file)
index 0000000..7c0be29
--- /dev/null
+++ b/data/grip.spec.in
@@ -0,0 +1,123 @@
+%define name grip
+%define version @VERSION@
+%define release 1
+%define prefix /usr
+
+Summary: Grip, a CD player, ripper, and MP3-encoder front-end
+Summary(zh_CN): Grip ÊÇÒ»¸ö CD ²¥·ÅÆ÷¡¢×¥¹ìÆ÷ºÍ MP3 ±àÂëÆ÷Ç°¶Ë³ÌÐò¡£
+Summary(zh_HK): Grip ¬O¤@­Ó CD ¼½©ñ¾¹¡B§ì­y¾¹©M MP3 ½s½X¾¹«eºÝµ{¦¡¡C
+Summary(zh_TW): Grip ¬O¤@­Ó CD ¼½©ñ¾¹¡B§ì­y¾¹©M MP3 ½s½X¾¹«eºÝµ{¦¡¡C
+Summary(fr): Grip, un lecteur de CD, extracteur, et IHM pour encodeur MP3
+Summary(de): Grip, ein CD-Spieler, Ripper und MP3/OGG Kodierer
+Name: %{name}
+Version: %{version}
+Release: %{release}
+Copyright: GPL
+Group: Applications/Multimedia
+Source: http://www.nostatic/grip/grip-%{version}.tar.gz
+URL: http://www.nostatic.org/grip
+Packager: Mike Oliphant <oliphant@gtk.org>
+Icon: gripicon.gif
+Buildroot: /var/tmp/%{name}-%{version}-root
+Requires: gnome-libs
+Requires: libghttp
+BuildRequires: gnome-libs-devel
+BuildRequires: gcc-c++
+BuildRequires: libghttp-devel
+BuildRequires: libgnomeui-devel
+BuildRequires: vte-devel
+BuildRequires: cdparanoia-devel
+Epoch: 1
+
+%description
+Grip is a cd-player and cd-ripper for the Gnome desktop. It has the ripping
+capabilities of cdparanoia built in, but can also use external rippers (such
+as cdda2wav). It also provides an automated frontend for MP3 (and other
+audio format) encoders, letting you take a disc and transform it easily
+straight into MP3s. Internet disc lookups are supported for retrieving track
+information from disc database servers. Grip works with DigitalDJ to provide
+a unified "computerized" version of your music collection.
+
+%description -l zh_CN
+Grip ÊÇÒ»¸ö¿ÉÒÔÔÚ GNOME ×ÀÃæ»·¾³ÏÂÔËÐÐµÄ CD ÒôÀÖ²¥·ÅÆ÷ºÍ×¥¹ìÆ÷¡£Ëü¿ÉÒÔʹÓÃ
+ÄÚÖÃµÄ cdparanoia ³ÌÐò×¥¹ìÆ÷ (½«Òô¹ì´æ´¢ÎªÎļþ)£¬Ò²¿ÉÒÔʹÓÃÍⲿµÄ×¥¹ìÆ÷
+(ÀýÈç: cdda2wav)¡£Í¬Ê±Ìṩ×Ô¶¯µÄ MP3 ±àÂëÇ°¶Ë£¬»¹¿ÉÒÔ×Ô¶¯µØ´Ó Internet ÉϵÄ
+¹âÅÌÊý¾Ý¿âÖвéѯ¹âÅÌÇúÄ¿¡£Èç¹ûЭͬ DigitalDJ ³ÌÐòÒ»Æð¹¤×÷£¬Äú¿ÉÒÔ´´½¨×Ô¼ºµÄ
+¡°¼ÆËã»ú»¯¡±µÄÒôÀÖ¿â¡£
+
+%description -l zh_HK
+Grip ¬O¤@­Ó¥i¥H¦b GNOME ®à­±Àô¹Ò¤U°õ¦æªº CD ­µ¼Ö¼½©ñ¾¹©M§ì­y¾¹¡C¥¦¥i¥H¨Ï
+¥Î¤º¸mªº cdparanoia µ{¦¡§ì­y¾¹ (±N­µ­y¦s¬°ÀÉ®×)¡A¤]¥i¥H¨Ï¥Î¥~³¡ªº§ì­y¾¹
+(¨Ò¦p cdda2wav)¡C¦P®É´£¨Ñ¦Û°Êªº MP3 ½s½X«eºÝ¡AÁÙ¥i¥H¦Û°Ê¦a±q Internet ¤W
+ªº¥úºÐ¸ê®Æ®w¤¤¬d¸ß¥úºÐ¦±¥Ø¡C¦pªG¨ó¦P DigitalDJ µ{¦¡¤@°_¤u§@¡A±z¥i¥H«Ø¥ß
+¦Û¤vªº¡u¹q¸£¤Æ¡vªº­µ¼Ö®w¡C
+
+%description -l zh_TW
+Grip ¬O¤@­Ó¥i¥H¦b GNOME ®à­±Àô¹Ò¤U°õ¦æªº CD ­µ¼Ö¼½©ñ¾¹©M§ì­y¾¹¡C¥¦¥i¥H¨Ï
+¥Î¤º¸mªº cdparanoia µ{¦¡§ì­y¾¹ (±N­µ­y¦s¬°ÀÉ®×)¡A¤]¥i¥H¨Ï¥Î¥~³¡ªº§ì­y¾¹
+(¨Ò¦p cdda2wav)¡C¦P®É´£¨Ñ¦Û°Êªº MP3 ½s½X«eºÝ¡AÁÙ¥i¥H¦Û°Ê¦a±q Internet ¤W
+ªº¥úºÐ¸ê®Æ®w¤¤¬d¸ß¥úºÐ¦±¥Ø¡C¦pªG¨ó¦P DigitalDJ µ{¦¡¤@°_¤u§@¡A±z¥i¥H«Ø¥ß
+¦Û¤vªº¡u¹q¸£¤Æ¡vªº­µ¼Ö®w¡C
+
+%description -l fr
+Grip est un lecteur-extracteur de CD pour le Bureau GNome. Il a des
+capacités d'extraction du type cdparanoia incluses, mais il peut utiliser
+un extracteur externe (comme cdda2wav). Il fournis également une IHM
+pour les encodeurs MP3 (ou d'autres format audio), permettant simplement 
+de prendre un disque et de le transformer en MP3. La récupération des noms 
+sur Internet permet également d'avoir les informations sur les pistes 
+auprès des serveurs CDDB.
+Grip fonctionne également avec DigitalDJ pour fournir une version unifiée
+informatique de votre discothèque.
+
+%description -l de
+Grip ist ein CD-Spieler und CD-Ripper für den Gnome Desktop. Die Fähigkeiten
+von cdparanoia sind statisch mit eingebunden, es können aber auch externe
+Ripper (wie cdda2wav) verwendet werden. Grip dient auch als automatisiertes
+Front-End für MP3/OGG/... Kodierer und ermöglicht somit eine Audio-CD einfach
+in MP3s zu verwandeln. Aus dem Internet können Titelinformationen von CDDB
+Datenbank-Servern abgerufen werden. Grip arbeitet zusammen mit DigitalDJ um
+eine einheitliche "computerisierte" Musikkollektion anbieten zu können.
+
+
+%prep
+rm -rf $RPM_BUILD_ROOT
+%setup
+
+%build
+./configure --prefix=%{_prefix} --disable-shared-cdpar --disable-shared-id3
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT
+
+make prefix=$RPM_BUILD_ROOT%{prefix} install
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-, root, root)
+%doc README ChangeLog CREDITS COPYING INSTALL NEWS AUTHORS TODO ABOUT-NLS
+%{_bindir}/grip
+%{_datadir}/gnome/help/grip
+%{_datadir}/applications/grip.desktop
+%{_datadir}/pixmaps/gripicon.png
+%{_datadir}/pixmaps/griptray.png
+%{_datadir}/locale/*/LC_MESSAGES/@GETTEXT_PACKAGE@.mo
+
+%changelog
+* Fri May 24 2002 Thomas Vander Stichele <thomas@apestaart.org>
+- added Requires: and BuildRequires:
+
+* Thu Apr 25 2002 Anthony Fok <anthony@thizlinux.com>
+- Added Traditional Chinese translations (based on Merlin's translations)
+
+* Thu Apr 04 2002 Merlin Ma <merlin@turbolinux.com.cn>
+- Added Simplified Chinese translations.
+- Added locale dir and files in %files
+- Modified spec file.
+
+* Mon Jan 28 2002 Eric Lassauge <lassauge@mail.dotcom.fr>
+- Added french translations

diff --git a/grip.desktop b/grip.desktop
deleted file mode 100644 (file)
index f600c92..0000000
--- a/grip.desktop
+++ /dev/null
@@ -1,24 +0,0 @@
-[Desktop Entry]
-Name=Grip
-Name[ca]=Grip
-Name[es]=Grip
-Name[de]=Grip
-Name[fi]=Grip
-Name[zh_CN]=Grip MP3 å<88>¶ä½<9C>ç¨<8B>åº<8F>
-Name[zh_CN.GB2312]=Grip MP3 å<88>¶ä½<9C>ç¨<8B>åº<8F>
-Name[zh_TW]=Grip MP3 製ä½<9C>ç¨<8B>å¼<8F>
-Name[zh_TW.Big5]=Grip MP3 製ä½<9C>ç¨<8B>å¼<8F>
-Comment=CD player/ripper
-Comment[ca]=Reproductor/extractor de CD d'audio
-Comment[es]=Reproductor/extractor de CDs de audio
-Comment[de]=Audio-CDs rippen und MP3s/OGGs kodieren
-Comment[fr]=Lecteur/extracteur de CD audio
-Comment[fi]=CD-audion soitto- ja kopiointiohjelma
-Comment[zh_CN]=Grip 让æ<82>¨è½»æ<9D>¾å<88>¶ä½<9C> MP3 æ<96><87>件
-Comment[zh_CN.GB2312]=Grip 让æ<82>¨è½»æ<9D>¾å<88>¶ä½<9C> MP3 æ<96><87>件
-Comment[zh_TW]=Grip è®<93>æ<82>¨è¼<95>é¬<86>製ä½<9C> MP3 æª<94>
-Comment[zh_TW.Big5]=Grip è®<93>æ<82>¨è¼<95>é¬<86>製ä½<9C> MP3 æª<94>
-Exec=grip
-Icon=gripicon.png
-Type=Application
-Categories=Application;AudioVideo;

diff --git a/grip.spec.in b/grip.spec.in
deleted file mode 100644 (file)
index 7c0be29..0000000
--- a/grip.spec.in
+++ /dev/null
@@ -1,123 +0,0 @@
-%define name grip
-%define version @VERSION@
-%define release 1
-%define prefix /usr
-
-Summary: Grip, a CD player, ripper, and MP3-encoder front-end
-Summary(zh_CN): Grip ÊÇÒ»¸ö CD ²¥·ÅÆ÷¡¢×¥¹ìÆ÷ºÍ MP3 ±àÂëÆ÷Ç°¶Ë³ÌÐò¡£
-Summary(zh_HK): Grip ¬O¤@­Ó CD ¼½©ñ¾¹¡B§ì­y¾¹©M MP3 ½s½X¾¹«eºÝµ{¦¡¡C
-Summary(zh_TW): Grip ¬O¤@­Ó CD ¼½©ñ¾¹¡B§ì­y¾¹©M MP3 ½s½X¾¹«eºÝµ{¦¡¡C
-Summary(fr): Grip, un lecteur de CD, extracteur, et IHM pour encodeur MP3
-Summary(de): Grip, ein CD-Spieler, Ripper und MP3/OGG Kodierer
-Name: %{name}
-Version: %{version}
-Release: %{release}
-Copyright: GPL
-Group: Applications/Multimedia
-Source: http://www.nostatic/grip/grip-%{version}.tar.gz
-URL: http://www.nostatic.org/grip
-Packager: Mike Oliphant <oliphant@gtk.org>
-Icon: gripicon.gif
-Buildroot: /var/tmp/%{name}-%{version}-root
-Requires: gnome-libs
-Requires: libghttp
-BuildRequires: gnome-libs-devel
-BuildRequires: gcc-c++
-BuildRequires: libghttp-devel
-BuildRequires: libgnomeui-devel
-BuildRequires: vte-devel
-BuildRequires: cdparanoia-devel
-Epoch: 1
-
-%description
-Grip is a cd-player and cd-ripper for the Gnome desktop. It has the ripping
-capabilities of cdparanoia built in, but can also use external rippers (such
-as cdda2wav). It also provides an automated frontend for MP3 (and other
-audio format) encoders, letting you take a disc and transform it easily
-straight into MP3s. Internet disc lookups are supported for retrieving track
-information from disc database servers. Grip works with DigitalDJ to provide
-a unified "computerized" version of your music collection.
-
-%description -l zh_CN
-Grip ÊÇÒ»¸ö¿ÉÒÔÔÚ GNOME ×ÀÃæ»·¾³ÏÂÔËÐÐµÄ CD ÒôÀÖ²¥·ÅÆ÷ºÍ×¥¹ìÆ÷¡£Ëü¿ÉÒÔʹÓÃ
-ÄÚÖÃµÄ cdparanoia ³ÌÐò×¥¹ìÆ÷ (½«Òô¹ì´æ´¢ÎªÎļþ)£¬Ò²¿ÉÒÔʹÓÃÍⲿµÄ×¥¹ìÆ÷
-(ÀýÈç: cdda2wav)¡£Í¬Ê±Ìṩ×Ô¶¯µÄ MP3 ±àÂëÇ°¶Ë£¬»¹¿ÉÒÔ×Ô¶¯µØ´Ó Internet ÉϵÄ
-¹âÅÌÊý¾Ý¿âÖвéѯ¹âÅÌÇúÄ¿¡£Èç¹ûЭͬ DigitalDJ ³ÌÐòÒ»Æð¹¤×÷£¬Äú¿ÉÒÔ´´½¨×Ô¼ºµÄ
-¡°¼ÆËã»ú»¯¡±µÄÒôÀÖ¿â¡£
-
-%description -l zh_HK
-Grip ¬O¤@­Ó¥i¥H¦b GNOME ®à­±Àô¹Ò¤U°õ¦æªº CD ­µ¼Ö¼½©ñ¾¹©M§ì­y¾¹¡C¥¦¥i¥H¨Ï
-¥Î¤º¸mªº cdparanoia µ{¦¡§ì­y¾¹ (±N­µ­y¦s¬°ÀÉ®×)¡A¤]¥i¥H¨Ï¥Î¥~³¡ªº§ì­y¾¹
-(¨Ò¦p cdda2wav)¡C¦P®É´£¨Ñ¦Û°Êªº MP3 ½s½X«eºÝ¡AÁÙ¥i¥H¦Û°Ê¦a±q Internet ¤W
-ªº¥úºÐ¸ê®Æ®w¤¤¬d¸ß¥úºÐ¦±¥Ø¡C¦pªG¨ó¦P DigitalDJ µ{¦¡¤@°_¤u§@¡A±z¥i¥H«Ø¥ß
-¦Û¤vªº¡u¹q¸£¤Æ¡vªº­µ¼Ö®w¡C
-
-%description -l zh_TW
-Grip ¬O¤@­Ó¥i¥H¦b GNOME ®à­±Àô¹Ò¤U°õ¦æªº CD ­µ¼Ö¼½©ñ¾¹©M§ì­y¾¹¡C¥¦¥i¥H¨Ï
-¥Î¤º¸mªº cdparanoia µ{¦¡§ì­y¾¹ (±N­µ­y¦s¬°ÀÉ®×)¡A¤]¥i¥H¨Ï¥Î¥~³¡ªº§ì­y¾¹
-(¨Ò¦p cdda2wav)¡C¦P®É´£¨Ñ¦Û°Êªº MP3 ½s½X«eºÝ¡AÁÙ¥i¥H¦Û°Ê¦a±q Internet ¤W
-ªº¥úºÐ¸ê®Æ®w¤¤¬d¸ß¥úºÐ¦±¥Ø¡C¦pªG¨ó¦P DigitalDJ µ{¦¡¤@°_¤u§@¡A±z¥i¥H«Ø¥ß
-¦Û¤vªº¡u¹q¸£¤Æ¡vªº­µ¼Ö®w¡C
-
-%description -l fr
-Grip est un lecteur-extracteur de CD pour le Bureau GNome. Il a des
-capacités d'extraction du type cdparanoia incluses, mais il peut utiliser
-un extracteur externe (comme cdda2wav). Il fournis également une IHM
-pour les encodeurs MP3 (ou d'autres format audio), permettant simplement 
-de prendre un disque et de le transformer en MP3. La récupération des noms 
-sur Internet permet également d'avoir les informations sur les pistes 
-auprès des serveurs CDDB.
-Grip fonctionne également avec DigitalDJ pour fournir une version unifiée
-informatique de votre discothèque.
-
-%description -l de
-Grip ist ein CD-Spieler und CD-Ripper für den Gnome Desktop. Die Fähigkeiten
-von cdparanoia sind statisch mit eingebunden, es können aber auch externe
-Ripper (wie cdda2wav) verwendet werden. Grip dient auch als automatisiertes
-Front-End für MP3/OGG/... Kodierer und ermöglicht somit eine Audio-CD einfach
-in MP3s zu verwandeln. Aus dem Internet können Titelinformationen von CDDB
-Datenbank-Servern abgerufen werden. Grip arbeitet zusammen mit DigitalDJ um
-eine einheitliche "computerisierte" Musikkollektion anbieten zu können.
-
-
-%prep
-rm -rf $RPM_BUILD_ROOT
-%setup
-
-%build
-./configure --prefix=%{_prefix} --disable-shared-cdpar --disable-shared-id3
-make
-
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT
-
-make prefix=$RPM_BUILD_ROOT%{prefix} install
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-, root, root)
-%doc README ChangeLog CREDITS COPYING INSTALL NEWS AUTHORS TODO ABOUT-NLS
-%{_bindir}/grip
-%{_datadir}/gnome/help/grip
-%{_datadir}/applications/grip.desktop
-%{_datadir}/pixmaps/gripicon.png
-%{_datadir}/pixmaps/griptray.png
-%{_datadir}/locale/*/LC_MESSAGES/@GETTEXT_PACKAGE@.mo
-
-%changelog
-* Fri May 24 2002 Thomas Vander Stichele <thomas@apestaart.org>
-- added Requires: and BuildRequires:
-
-* Thu Apr 25 2002 Anthony Fok <anthony@thizlinux.com>
-- Added Traditional Chinese translations (based on Merlin's translations)
-
-* Thu Apr 04 2002 Merlin Ma <merlin@turbolinux.com.cn>
-- Added Simplified Chinese translations.
-- Added locale dir and files in %files
-- Modified spec file.
-
-* Mon Jan 28 2002 Eric Lassauge <lassauge@mail.dotcom.fr>
-- Added french translations