fedora-rpmdevtools Makefile.am,1.4,1.5 rpmdevtools.spec,1.1,1.2

[Ville Skytta (scop)]

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7351

Modified Files:
	Makefile.am rpmdevtools.spec 
Log Message:
Move files around as planned in https://www.redhat.com/archives/fedora-extras-list/2006-July/msg00557.html


Index: Makefile.am
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.am	17 Jul 2006 20:02:10 -0000	1.4
+++ Makefile.am	17 Jul 2006 20:34:44 -0000	1.5
@@ -2,8 +2,8 @@
 
 SUBDIRS = emacs test
 
-pkgdatadir = $(datadir)/fedora
-pkgsysconfdir = $(sysconfdir)/fedora
+pkgdatadir = $(datadir)/rpmdevtools
+pkgsysconfdir = $(sysconfdir)/rpmdevtools
 rpmlibdir = $(libdir)/rpm
 
 dist_bin_SCRIPTS = buildrpmtree diffarchive extractarchive \
@@ -11,16 +11,16 @@
 	rmdevelrpms rpmchecksig rpminfo rpmvercmp \
 	wipebuildtree
 
-dist_pkgdata_DATA = spectemplate-lib.spec spectemplate-minimal.spec \
-	spectemplate-perl.spec spectemplate-python.spec \
-	spectemplate-ruby.spec template.init
-
 dist_man1_MANS = extractarchive.1 diffarchive.1
 dist_man8_MANS = rmdevelrpms.8
 
-dist_rpmlib_SCRIPTS = check-buildroot check-rpaths check-rpaths-worker
+dist_pkgdata_DATA = template.init
 
-dist_pkgsysconf_DATA = rmdevelrpms.conf
+dist_pkgsysconf_DATA = spectemplate-lib.spec spectemplate-minimal.spec \
+	spectemplate-perl.spec spectemplate-python.spec \
+	spectemplate-ruby.spec rmdevelrpms.conf
+
+dist_rpmlib_SCRIPTS = check-buildroot check-rpaths check-rpaths-worker
 
 EXTRA_DIST = $(PACKAGE).spec
 


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdevtools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpmdevtools.spec	17 Jul 2006 20:02:10 -0000	1.1
+++ rpmdevtools.spec	17 Jul 2006 20:34:44 -0000	1.2
@@ -60,8 +60,8 @@
 
 for dir in %{emacs_sitestart_d} %{xemacs_sitestart_d} ; do
   install -dm 755 $RPM_BUILD_ROOT$dir
-  ln -s %{_datadir}/fedora/emacs/%{name}-init.el $RPM_BUILD_ROOT$dir
-  touch $RPM_BUILD_ROOT$dir/%{name}-init.elc
+  ln -s %{_datadir}/rpmdevtools/rpmdevtools-init.el $RPM_BUILD_ROOT$dir
+  touch $RPM_BUILD_ROOT$dir/rpmdevtools-init.elc
 done
 
 # Backwards compatibility symlinks
@@ -87,24 +87,24 @@
 
 %triggerin -- emacs-common
 [ -d %{emacs_sitestart_d} ] && \
-  ln -sf %{_datadir}/fedora/emacs/%{name}-init.el %{emacs_sitestart_d} || :
+  ln -sf %{_datadir}/rpmdevtools/rpmdevtools-init.el %{emacs_sitestart_d} || :
 
 %triggerin -- xemacs-common
 [ -d %{xemacs_sitestart_d} ] && \
-  ln -sf %{_datadir}/fedora/emacs/%{name}-init.el %{xemacs_sitestart_d} || :
+  ln -sf %{_datadir}/rpmdevtools/rpmdevtools-init.el %{xemacs_sitestart_d} || :
 
 %triggerun -- emacs-common
-[ $2 -eq 0 ] && rm -f %{emacs_sitestart_d}/%{name}-init.el* || :
+[ $2 -eq 0 ] && rm -f %{emacs_sitestart_d}/rpmdevtools-init.el* || :
 
 %triggerun -- xemacs-common
-[ $2 -eq 0 ] && rm -f %{xemacs_sitestart_d}/%{name}-init.el* || :
+[ $2 -eq 0 ] && rm -f %{xemacs_sitestart_d}/rpmdevtools-init.el* || :
 
 
 %files
 %defattr(-,root,root,-)
 %doc COPYING README*
-%config(noreplace) %{_sysconfdir}/fedora
-%{_datadir}/fedora/
+%config(noreplace) %{_sysconfdir}/rpmdevtools/
+%{_datadir}/rpmdevtools/
 %{_bindir}/*
 %{_prefix}/lib/rpm/check-*
 %ghost %{_datadir}/*emacs
@@ -114,6 +114,9 @@
 %changelog
 * Mon Jul 17 2006 Ville Skyttä <ville.skytta at iki.fi>
 - Drop fedora- prefix everywhere, add backcompat symlinks for execubtables.
+- Move %%{_sysconfdir}/fedora to %%{_sysconfdir}/rpmdevtools and
+  %%{_datadir}/fedora to %%{_datadir}/rpmdevtools.
+- Move spec templates to %%{_sysconfdir}/rpmdevtools, mark as config.
 - Bump version to 5.0.
 
 * Sun Jul 16 2006 Ville Skyttä <ville.skytta at iki.fi>