Browse Source

updated semi-vl.spec: rebuit

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3493 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 13 years ago
parent
commit
914c4d809a
1 changed files with 20 additions and 17 deletions
  1. 20 17
      s/semi/semi-vl.spec

+ 20 - 17
s/semi/semi-vl.spec

@@ -1,5 +1,5 @@
 %define _noVersionedDependencies        1
-%define prereq_ge()  %(LC_ALL="C" rpm -q --queryformat 'PreReq:%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
+%define prereq_ge()  %(LC_ALL="C" rpm -q --queryformat 'Requires(post):%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
 %define       origver       1.14.6
 %define       origname      semi
 
@@ -22,8 +22,8 @@ Group:        Applications/Editors/Emacs
 BuildRoot:    %{_tmppath}/%{name}-%{version}-root
 BuildArch:    noarch
 
-PreReq:       emacsen
-BuildPreReq:  emacsen-common, flim
+Requires(post):       emacsen
+BuildRequires:  emacsen-common, flim
 %prereq_ge    emacsen-common
 %prereq_ge    flim
 Obsoletes:    %{origname}-el
@@ -61,7 +61,7 @@ MIME メッセージを読んだり,作成したり出来るようになりま
 
 %prep
 
-rm -rf ${RPM_BUILD_DIR}/%{origname}-%{origver}
+%__rm -rf ${RPM_BUILD_DIR}/%{origname}-%{origver}
 
 
 %setup  -n %{origname}-%{origver}
@@ -72,22 +72,22 @@ rm -rf ${RPM_BUILD_DIR}/%{origname}-%{origver}
 
 
 %build
-make info
+%__make info
 
 
 %install
-[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
-[ "${RPM_BUILD_ROOT}" != "/" ] && mkdir -p ${RPM_BUILD_ROOT}
+[ "${RPM_BUILD_ROOT}" != "/" ] && %__rm -rf ${RPM_BUILD_ROOT}
+[ "${RPM_BUILD_ROOT}" != "/" ] && %__mkdir_p ${RPM_BUILD_ROOT}
 
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp/%{origname}
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/emacsen-common/packages/install
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/emacsen-common/packages/remove
+%__mkdir_p $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp/%{origname}
+%__mkdir_p ${RPM_BUILD_ROOT}%{emacsen_pkgdir}/install
+%__mkdir_p ${RPM_BUILD_ROOT}%{emacsen_pkgdir}/remove
 
 #
 # install el files
 # 
 
-cp Makefile SEMI-* *.el %{SOURCE3} \
+%__cp Makefile SEMI-* *.el %{SOURCE3} \
    ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/%{origname}
 
 #
@@ -102,8 +102,8 @@ cp Makefile SEMI-* *.el %{SOURCE3} \
 # install info file
 # 
 
-mkdir -p ${RPM_BUILD_ROOT}%{_infodir}
-install -m 644 *.info ${RPM_BUILD_ROOT}%{_infodir}
+%__mkdir_p ${RPM_BUILD_ROOT}%{_infodir}
+%__install -m 644 *.info ${RPM_BUILD_ROOT}%{_infodir}
 
 
 %post 
@@ -152,9 +152,9 @@ fi
 
 
 %clean
-[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
+[ "${RPM_BUILD_ROOT}" != "/" ] && %__rm -rf ${RPM_BUILD_ROOT}
 
-rm -rf ${RPM_BUILD_DIR}/semi-%{origver}
+%__rm -rf ${RPM_BUILD_DIR}/semi-%{origver}
 
 
 %files
@@ -163,11 +163,14 @@ rm -rf ${RPM_BUILD_DIR}/semi-%{origver}
 %doc *.sgml *.texi
 %{_infodir}/mime-ui*.info*
 %{_datadir}/emacs/site-lisp/%{origname}/
-%{_libdir}/emacsen-common/packages/install/%{origname}
-%{_libdir}/emacsen-common/packages/remove/%{origname}
+%{emacsen_pkgdir}/install/%{name}
+%{emacsen_pkgdir}/remove/%{name}
  
 
 %changelog
+* Sat Apr 16 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.14.6-2
+- rebuilt
+
 * Sun Aug  3 2008 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.14.6-1
 - applied new versioning policy
 - spec in UTF-8